Can't recognize changes - hopefuly they are useful.
This commit is contained in:
@@ -78,6 +78,12 @@ info (){
|
||||
echo -e "\t[ \033[32m\033[1mInfo\033[m ]: $*"
|
||||
echo ""
|
||||
}
|
||||
|
||||
print_command () {
|
||||
echo ""
|
||||
echo -e "\t\033[33m\033[1mCommand was\033[m: $*"
|
||||
echo ""
|
||||
}
|
||||
echo_done() {
|
||||
echo -e "\033[80G[ \033[32mdone\033[m ]"
|
||||
}
|
||||
@@ -397,7 +403,7 @@ read ok
|
||||
echo ""
|
||||
|
||||
if $EASYRSA_LAYOUT_NEW ; then
|
||||
${EASY_RSA_DIR}/easyrsa build-client-full ${_CLIENT_CN}
|
||||
${EASY_RSA_DIR}/easyrsa --vars="${EASY_RSA_DIR}/vars" build-client-full ${_CLIENT_CN}
|
||||
else
|
||||
${EASY_RSA_DIR}/build-key-pass ${NEW_KEY_NAME}
|
||||
fi
|
||||
@@ -405,12 +411,23 @@ if [[ $? -eq 0 ]] ; then
|
||||
info "Building key '${NEW_KEY_NAME}.key' was successfully."
|
||||
else
|
||||
error "Building key '${NEW_KEY_NAME}.key' failed!"
|
||||
|
||||
print_command "${EASY_RSA_DIR}/easyrsa --vars=\"${EASY_RSA_DIR}/vars\" init-pki"
|
||||
|
||||
echononl "continue anyway [yes/no]: "
|
||||
read OK
|
||||
OK="$(echo "$OK" | tr '[:upper:]' '[:lower:]')"
|
||||
while [[ "$OK" != "yes" ]] && [[ "$OK" != "no" ]] ; do
|
||||
echononl "Wrong entry! - repeat [yes/nno]: "
|
||||
read OK
|
||||
done
|
||||
[[ $OK = "yes" ]] || fatal "Abbruch durch User"
|
||||
fi
|
||||
|
||||
echo ""
|
||||
echononl "Type <return> to continue: "
|
||||
read ok
|
||||
echo ""
|
||||
#echo ""
|
||||
#echononl "Type <return> to continue: "
|
||||
#read ok
|
||||
#echo ""
|
||||
|
||||
echononl " Add new key credentials to file ${OPENVPN_BASE_DIR}/keys-created.txt"
|
||||
cat << EOF >> ${OPENVPN_BASE_DIR}/keys-created.txt
|
||||
@@ -723,7 +740,8 @@ else
|
||||
fi
|
||||
done
|
||||
fi
|
||||
|
||||
|
||||
blank_line
|
||||
if $_copy_to_user_home_dir ; then
|
||||
_home_dir=$(eval echo "~$user_name")
|
||||
_target_dir="${_home_dir}/VPN/${_CLIENT_CN}"
|
||||
|
||||
Reference in New Issue
Block a user