From 440b21102bbb756a959565b5d8dcf209618f96af Mon Sep 17 00:00:00 2001 From: A Holt Date: Sun, 29 Apr 2018 02:34:11 -0400 Subject: [PATCH] Update iiab-vpn --- roles/openvpn/templates/iiab-vpn | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/roles/openvpn/templates/iiab-vpn b/roles/openvpn/templates/iiab-vpn index f1d3c1d9f..c3aab24eb 100755 --- a/roles/openvpn/templates/iiab-vpn +++ b/roles/openvpn/templates/iiab-vpn @@ -3,7 +3,7 @@ if [ ! -f "/etc/openvpn/iiab-vpn.conf" ]; then VPNCONFIG='party-line.conf' - VPNIP=10.8.0.1 + VPNIP={{ openvpn_server_virtual_ip }} else # expect the sourced file to set the above variables source /etc/openvpn/iiab-vpn.conf @@ -23,9 +23,9 @@ case $1 in "status") pid=`ps -e|grep openvpn` if [ -z "$pid" ]; then - echo "The openvpn process is not running" + echo "The OpenVPN process is not running" else - echo "Openvpn is running with id $pid" + echo "OpenVPN is running with id $pid" ip=`ifconfig tun | gawk '(/netmask /) {print( $2);}'` echo "Local vpn tunnel address is $ip" fi @@ -41,7 +41,7 @@ if [ $PASSWORDS_ENABLED -eq 0 ];then case $1 in "test" | "unsafe") ;; *) - echo "Openvpn is only safe when public/private keys are used" + echo "OpenVPN is only safe when public/private keys are used" echo " And when passwords are turned off in /etc/ssh/sshd_conf" exit 1 esac @@ -76,8 +76,7 @@ case $cmd in echo "Stopping any openvpn instance" killall openvpn sleep 10 - echo "Starting openvpn and waiting 10 seconds for daemon to become r -eady" + echo "Starting OpenVPN and waiting 10 seconds for daemon to become ready" openvpn --cd $dir --daemon --config $VPNCONFIG fi sleep 10 @@ -88,5 +87,6 @@ eady" else echo "vpn connection failed" fi + ;; esac