install/openvpn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

install_openvpn.sh: change default base directory to '/etc/openvpn/server'.

Browse Source
This commit is contained in:
Christoph 2022-03-15 14:59:01 +01:00
parent 26e6c4c9e3
commit ba9b9aac95
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
install_openvpn.sh
View File

@ -305,8 +305,6 @@ else
done done
fi fi
[[ -n "$OPENVPN_BASE_DIR" ]] && DEFAULT_OPENVPN_BASE_DIR="$OPENVPN_BASE_DIR"
[[ -n "$CA_EXPIRE" ]] && DEFAULT_CERT_EXPIRE="$(trim "$CA_EXPIRE")" [[ -n "$CA_EXPIRE" ]] && DEFAULT_CERT_EXPIRE="$(trim "$CA_EXPIRE")"
[[ -n "$KEY_PROVINCE" ]] && DEFAULT_KEY_PROVINCE="$(trim "$KEY_PROVINCE")" [[ -n "$KEY_PROVINCE" ]] && DEFAULT_KEY_PROVINCE="$(trim "$KEY_PROVINCE")"
[[ -n "$KEY_CITY" ]] && DEFAULT_KEY_CITY="$(trim "$KEY_CITY")" [[ -n "$KEY_CITY" ]] && DEFAULT_KEY_CITY="$(trim "$KEY_CITY")"
@ -508,9 +506,7 @@ while ! $_OK ; do
done done
DEFAULT_OPENVPN_BASE_DIR="/etc/openvpn/server/${OPENVPN_NAME}"
[[ -z "$DEFAULT_OPENVPN_BASE_DIR" ]] && DEFAULT_OPENVPN_BASE_DIR="/etc/openvpn/server/${OPENVPN_NAME}"
echo "" echo ""
@ -518,7 +514,7 @@ echo ""
echo "Insert OpenVPN Base Directory for Service '$OPENVPN_NAME'" echo "Insert OpenVPN Base Directory for Service '$OPENVPN_NAME'"
echo "" echo ""
if ! $_only_create_config_file ; then 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 "" echo ""
fi fi
OPENVPN_BASE_DIR="" OPENVPN_BASE_DIR=""
@ -529,8 +525,8 @@ while [[ "X${OPENVPN_BASE_DIR}" = "X" ]]; do
if [[ "X$OPENVPN_BASE_DIR" = "X" ]]; then if [[ "X$OPENVPN_BASE_DIR" = "X" ]]; then
OPENVPN_BASE_DIR="$DEFAULT_OPENVPN_BASE_DIR" OPENVPN_BASE_DIR="$DEFAULT_OPENVPN_BASE_DIR"
else else
if [[ ! "$(dirname ${OPENVPN_BASE_DIR})" = "/etc/openvpn" ]] && ! $_only_create_config_file ; then 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'. Retry..\033[m\n" 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}]: " echononl "OpenVPN Base Directory [${DEFAULT_OPENVPN_BASE_DIR}]: "
OPENVPN_BASE_DIR="" OPENVPN_BASE_DIR=""
fi fi