From ba9b9aac95c8861bfcd1909798150b7ca1d3dbc4 Mon Sep 17 00:00:00 2001 From: Christoph Date: Tue, 15 Mar 2022 14:59:01 +0100 Subject: [PATCH] install_openvpn.sh: change default base directory to '/etc/openvpn/server'. --- install_openvpn.sh | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/install_openvpn.sh b/install_openvpn.sh index 073aa83..958110d 100755 --- a/install_openvpn.sh +++ b/install_openvpn.sh @@ -305,8 +305,6 @@ else done fi -[[ -n "$OPENVPN_BASE_DIR" ]] && DEFAULT_OPENVPN_BASE_DIR="$OPENVPN_BASE_DIR" - [[ -n "$CA_EXPIRE" ]] && DEFAULT_CERT_EXPIRE="$(trim "$CA_EXPIRE")" [[ -n "$KEY_PROVINCE" ]] && DEFAULT_KEY_PROVINCE="$(trim "$KEY_PROVINCE")" [[ -n "$KEY_CITY" ]] && DEFAULT_KEY_CITY="$(trim "$KEY_CITY")" @@ -508,9 +506,7 @@ while ! $_OK ; do done - - -[[ -z "$DEFAULT_OPENVPN_BASE_DIR" ]] && DEFAULT_OPENVPN_BASE_DIR="/etc/openvpn/server/${OPENVPN_NAME}" +DEFAULT_OPENVPN_BASE_DIR="/etc/openvpn/server/${OPENVPN_NAME}" echo "" @@ -518,7 +514,7 @@ echo "" echo "Insert OpenVPN Base Directory for Service '$OPENVPN_NAME'" echo "" if ! $_only_create_config_file ; then - echo " Note: must be a subdirectory of '/etc/openvpn'" + echo " Note: must be a subdirectory of '/etc/openvpn/server'" echo "" fi OPENVPN_BASE_DIR="" @@ -529,8 +525,8 @@ while [[ "X${OPENVPN_BASE_DIR}" = "X" ]]; do if [[ "X$OPENVPN_BASE_DIR" = "X" ]]; then OPENVPN_BASE_DIR="$DEFAULT_OPENVPN_BASE_DIR" else - if [[ ! "$(dirname ${OPENVPN_BASE_DIR})" = "/etc/openvpn" ]] && ! $_only_create_config_file ; then - echo -e "\n\t\033[33m\033[1mGiven entry is NOT a subdirectory of '/etc/openvpn'. Retry..\033[m\n" + if [[ ! "$(dirname ${OPENVPN_BASE_DIR})" = "/etc/openvpn/server" ]] && ! $_only_create_config_file ; then + echo -e "\n\t\033[33m\033[1mGiven entry is NOT a subdirectory of '/etc/openvpn/server'. Retry..\033[m\n" echononl "OpenVPN Base Directory [${DEFAULT_OPENVPN_BASE_DIR}]: " OPENVPN_BASE_DIR="" fi