diff --git a/install_openvpn.sh b/install_openvpn.sh index 5e1f23d..c2d4865 100755 --- a/install_openvpn.sh +++ b/install_openvpn.sh @@ -177,10 +177,12 @@ DEFAULT_KEY_SIZE=4096 DEFAULT_KEY_COUNTRY="DE" DEFAULT_KEY_PROVINCE="Berlin" DEFAULT_KEY_CITY="Berlin" -DEFAULT_KEY_EMAIL='support@oopen.de' +DEFAULT_KEY_EMAIL='argus@oopen.de' +DEFAULT_KEY_ORG='o.open' DEFAULT_KEY_OU="Network Services" -DEFAULT_SERVER_CIPHER="AES-256-CBC" +DEFAULT_SERVER_CIPHER="" +#DEFAULT_SERVER_CIPHER="AES-256-CBC" #--------------------------------------- @@ -250,6 +252,25 @@ if $(grep -q -E "SERVER_PORT=$SERVER_PORT" ${script_dir}/conf/server-*.conf 2> / warn "Port '$SERVER_PORT' is already in use by an other OpenVPN Service on this Server" fi +echo "" +echo "Insert abbreviation (acronym) for the company or organisation" +echo "" +echo " Example: 'AKB' or 'FLR' or 'OPP' or.." +echo "" +ORG_ACRONYM="" +echononl "Organisations acronym: " +read ORG_ACRONYM +while [ "X$ORG_ACRONYM" = "X" ] ; do + echo -e "\n\t\033[33m\033[1mSetting 'OpenVPN Name' is required!\033[m\n" + echononl "Organisations acronym: " + read ORG_ACRONYM +done + +DEFAULT_KEY_NAME="VPN $ORG_ACRONYM" +DEFAULT_KEY_CN="VPN-$ORG_ACRONYM" +DEFAULT_KEY_ALTNAMES="VPN $ORG_ACRONYM" + + echo "" echo "Insert Name of OpenVPN Service (i.e. so36, gw-ckubu, opferperspektive)" echo "" @@ -266,11 +287,6 @@ done DEFAULT_OPENVPN_BASE_DIR="/etc/openvpn/${OPENVPN_NAME}" -[[ -n "$DEFAULT_KEY_ORG" ]] || DEFAULT_KEY_ORG="$OPENVPN_NAME" - -DEFAULT_KEY_NAME="$OPENVPN_NAME" -DEFAULT_KEY_CN="$OPENVPN_NAME" -DEFAULT_KEY_ALTNAMES="$OPENVPN_NAME" echo "" echo ""