From 01c82fdfceec18aeaab59c2b66c1f4f80f82e33b Mon Sep 17 00:00:00 2001 From: A Holt Date: Wed, 15 Aug 2018 14:14:11 -0400 Subject: [PATCH] Update and rename start.j2 to start.j2.deprecated --- roles/openvpn/templates/start.j2 | 27 --------------------- roles/openvpn/templates/start.j2.deprecated | 27 +++++++++++++++++++++ 2 files changed, 27 insertions(+), 27 deletions(-) delete mode 100644 roles/openvpn/templates/start.j2 create mode 100644 roles/openvpn/templates/start.j2.deprecated diff --git a/roles/openvpn/templates/start.j2 b/roles/openvpn/templates/start.j2 deleted file mode 100644 index 373927f51..000000000 --- a/roles/openvpn/templates/start.j2 +++ /dev/null @@ -1,27 +0,0 @@ -$!/bin/bash -$ start the openvpn tunnel if the service is enabled - -enabled={{ openvpn_enabled }} -VPNIP-{{ openvpn_server_port }} - -if [ "$enabled" = 'True' ]; then - # make sure the wan is functioning - # 8.8.8.8 is one of google's dns servers - ping -c 3 -i 3 8.8.8.8 - if [ $? -ne 0 ]; then - #echo "internet is not available, tunnel not possible" - exit 1 - fi - - # check the vpn tunnel - ping -c 5 -i 5 "$VPNIP" - # a zero return means the tunnel is up - if [ $? -eq 0 ]; then - exit 0 - else - killall openvpn - sleep 10 - #echo "Starting openvpn and waiting 10 seconds for daemon to become ready" - systemctl start openvpn@xscenet - fi -fi diff --git a/roles/openvpn/templates/start.j2.deprecated b/roles/openvpn/templates/start.j2.deprecated new file mode 100644 index 000000000..400c1feb5 --- /dev/null +++ b/roles/openvpn/templates/start.j2.deprecated @@ -0,0 +1,27 @@ +$!/bin/bash +$ start the openvpn tunnel if the service is enabled + +enabled={{ openvpn_enabled }} +VPNIP={{ openvpn_server_port }} + +if [ "$enabled" = 'True' ]; then + # make sure the wan is functioning + # 8.8.8.8 is one of google's dns servers + ping -c 3 -i 3 8.8.8.8 + if [ $? -ne 0 ]; then + #echo "internet is not available, tunnel not possible" + exit 1 + fi + + # check the vpn tunnel + ping -c 5 -i 5 "$VPNIP" + # a zero return means the tunnel is up + if [ $? -eq 0 ]; then + exit 0 + else + killall openvpn + sleep 10 + #echo "Starting openvpn and waiting 10 seconds for daemon to become ready" + systemctl start openvpn@xscenet + fi +fi