From 3dad45fd5a907c197bd3415eeddaa03add90d5fe Mon Sep 17 00:00:00 2001 From: A Holt Date: Sat, 11 May 2019 23:25:51 -0400 Subject: [PATCH] Update iiab-handle.j2 --- roles/openvpn/templates/iiab-handle.j2 | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/roles/openvpn/templates/iiab-handle.j2 b/roles/openvpn/templates/iiab-handle.j2 index d3a29e91b..157d653e5 100755 --- a/roles/openvpn/templates/iiab-handle.j2 +++ b/roles/openvpn/templates/iiab-handle.j2 @@ -1,17 +1,9 @@ #!/bin/bash +echo -e "\n\n\e[41m DEPRECATED PLEASE RUN 'iiab-support' INSTEAD \e[0m\n\n" -echo -e '\n\nDEPRECATED:\n' - -echo -e 'This interactive script TEMPORARILY (over)writes /etc/iiab/openvpn_handle' -echo -e 'to identify IIAB to the upstream OpenVPN server, until Ansible next runs.\n\n' - - -echo -e 'PLEASE USE THIS NEW METHOD INSTEAD:\n' - -echo -e 'cd /opt/iiab/iiab' -echo -e 'sudo ./install-support\n\n' - +echo -e 'This older script TEMPORARILY (over)writes /etc/iiab/openvpn_handle to' +echo -e 'identify IIAB to the upstream OpenVPN server, until Ansible next runs.\n' #echo -e 'CORRECT METHOD: CHANGE VARIABLE openvpn_handle IN /etc/iiab/local_vars.yml' #echo -e 'THEN RUN "cd /opt/iiab/iiab" THEN "./runrole openvpn"\n' @@ -20,7 +12,6 @@ echo -e 'PLEASE NOW TYPE CTRL-C TO QUIT. Or, if you really want it temporary un read -p 'next time Ansible is run, what OpenVPN handle do you want? ' ans echo - if [ "$ans" != "" ]; then echo $ans > /etc/iiab/openvpn_handle echo -e "\nYour machine's openvpn_handle is TEMPORARILY now set... \n" @@ -28,7 +19,7 @@ else echo -e "\nWARNING: your machine's openvpn_handle remains unchanged...\n" fi -echo -e "Restarting OpenVPN daemon...\n\n" +echo -e "Restarting OpenVPN daemon...\n" # 2019-05-09: removing /etc/iiab/openvpn_handle (or setting it to "") are both very bad practices #if [ "$ans" == "" ]; then @@ -39,7 +30,6 @@ echo -e "Restarting OpenVPN daemon...\n\n" # echo $ans > /etc/iiab/openvpn_handle #fi - {{ systemctl_program }} restart openvpn@xscenet # This would also work: (but would bounce all VPN connections, if others exist, causing unnec disruption if so) #{{ systemctl_program }} restart openvpn