diff --git a/install_openvpn.sh b/install_openvpn.sh index 8f636ce..3805a35 100755 --- a/install_openvpn.sh +++ b/install_openvpn.sh @@ -181,7 +181,7 @@ DEFAULT_KEY_EMAIL='argus@oopen.de' DEFAULT_KEY_ORG='o.open' DEFAULT_KEY_OU="Network Services" -DEFAULT_SERVER_CIPHER="" +DEFAULT_SERVER_CIPHER="None" #DEFAULT_SERVER_CIPHER="AES-256-CBC" @@ -208,6 +208,7 @@ else fatal "$(cat $log_file)" fi fi +[[ -z "$DEFAULT_SERVER_CIPHER" ]] && DEFAULT_SERVER_CIPHER='None' echo "" echo "" @@ -506,11 +507,9 @@ echononl "Server cryptographic cipher [${DEFAULT_SERVER_CIPHER}]: " read SERVER_CIPHER if [[ "X$SERVER_CIPHER" = "X" ]]; then SERVER_CIPHER="$DEFAULT_SERVER_CIPHER" -else - _to_lower_server_cipher="$( trim ${SERVER_CIPHER,,})" - if [[ "$_to_lower_server_cipher" = "none" ]]; then - SERVER_CIPHER="" - fi +fi +if [[ "$(trim ${SERVER_CIPHER,,})" = none ]]; then + SERVER_CIPHER="" fi echo "" @@ -721,7 +720,11 @@ fi echo "" -info "Starting Installation of OpenVPN Service \033[37m\033[1m${OPENVPN_NAME}\033[m.." +if $_only_create_config_file ; then + info "Create configuration file for OpenVPN Service \033[37m\033[1m${OPENVPN_NAME}\033[m.." +else + info "Starting Installation of OpenVPN Service \033[37m\033[1m${OPENVPN_NAME}\033[m.." +fi echo -n "To continue type uppercase 'YES': " read OK echo "" @@ -815,9 +818,18 @@ cat << EOF >> $_openvpn_name_conf_file 2> $log_file OPENVPN_NETWORK="$OPENVPN_NETWORK" +EOF +if [[ -n "$SERVER_CIPHER" ]] ; then + cat << EOF >> $_openvpn_name_conf_file 2> $log_file SERVER_CIPHER="$SERVER_CIPHER" EOF +else + cat << EOF >> $_openvpn_name_conf_file 2> $log_file +SERVER_CIPHER="none" + +EOF +fi if [[ ${#REMOTE_NETWORK_ARR[@]} -gt 0 ]] ; then cat << EOF >> $_openvpn_name_conf_file 2> $log_file @@ -869,7 +881,7 @@ fi if $_only_create_config_file ; then - echo "" + info "Configuration filr for OpenVPN Service \033[1;37m$OPENVPN_NAME\033[m was written \n to file \033[1;37m$_openvpn_name_conf_file\033[m." clean_up 0 fi