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

Add variable 'ORG_SHORTCUT'. Change name of service output-files.

Browse Source
This commit is contained in:
Christoph
2019-07-15 15:01:41 +02:00
parent 20f0ebddd6
commit dda55a4cf4
3 changed files with 37 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
install_openvpn.sh
View File

@@ -319,22 +319,22 @@ if $(grep -q -E "SERVER_PORT=$SERVER_PORT" ${script_dir}/conf/server-*.conf 2> /
fi
echo ""
echo "Insert abbreviation (acronym) for the company or organisation"
echo "Insert shortcut (acronym) for the company or organisation"
echo ""
echo " Example: 'AKB' or 'FLR' or 'OPP' or.."
echo ""
ORG_ACRONYM=""
ORG_SHORTCUT=""
echononl "Organisations acronym: "
read ORG_ACRONYM
while [ "X$ORG_ACRONYM" = "X" ] ; do
read ORG_SHORTCUT
while [ "X$ORG_SHORTCUT" = "X" ] ; do
echo -e "\n\t\033[33m\033[1mSetting 'OpenVPN Name' is required!\033[m\n"
echononl "Organisations acronym: "
read ORG_ACRONYM
echononl "Organisations shortcut: "
read ORG_SHORTCUT
done
DEFAULT_KEY_NAME="VPN $ORG_ACRONYM"
DEFAULT_KEY_CN="VPN-$ORG_ACRONYM"
DEFAULT_KEY_ALTNAMES="VPN $ORG_ACRONYM"
DEFAULT_KEY_NAME="VPN $ORG_SHORTCUT"
DEFAULT_KEY_CN="VPN-$ORG_SHORTCUT"
DEFAULT_KEY_ALTNAMES="VPN $ORG_SHORTCUT"
echo ""
@@ -742,7 +742,9 @@ echo ""
echo -e "\tOpenVPN IP-Address/Hostname.........: $OPENVPN_SERVER"
echo -e "\tOpenVPN Server.Port.................: $SERVER_PORT"
echo ""
echo -e "\tOpenVPN Servive Name................: $OPENVPN_NAME"
echo -e "\tOrganisation shortcut...............: $ORG_SHORTCUT"
echo ""
echo -e "\tOpenVPN Service Name................: $OPENVPN_NAME"
echo -e "\tOpenVPN Base Directory..............: $OPENVPN_BASE_DIR"
echo -e "\tOpenVPN 'easy-rsa' Directory........: $EASY_RSA_DIR"
echo -e "\tOpenVPN 'ccd' Directory.............: $OPENVPN_CCD_DIR"
@@ -844,6 +846,8 @@ cat << EOF > $_openvpn_name_conf_file 2> $log_file
OPENVPN_SERVER="$OPENVPN_SERVER"
SERVER_PORT=$SERVER_PORT
ORG_SHORTCUT="$ORG_SHORTCUT"
OPENVPN_NAME="$OPENVPN_NAME"
OPENVPN_BASE_DIR="$OPENVPN_BASE_DIR"