From ff76f3e4294205053ea32754cc40b74a5ebc3d2c Mon Sep 17 00:00:00 2001 From: A Holt Date: Mon, 13 Aug 2018 20:29:05 -0400 Subject: [PATCH] Update announcer --- roles/openvpn/templates/announcer | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/roles/openvpn/templates/announcer b/roles/openvpn/templates/announcer index 7b9a95a1c..26de78019 100755 --- a/roles/openvpn/templates/announcer +++ b/roles/openvpn/templates/announcer @@ -4,21 +4,22 @@ HANDLE= UUID= source /etc/iiab/iiab.env -if [ -z "$HANDLE" ]; then - HANDLE=`cat /etc/iiab/iiab.ini | gawk \ - '{ if((toupper($1) == "HANDLE") && ($2 == "=")) { print $3;}}'` -fi -if [ -z "$HANDLE" ]; then - if [ -f /etc/iiab/openvpn_handle ]; then - HANDLE=`cat /etc/iiab/openvpn_handle` - fi +if [ -f /etc/iiab/openvpn_handle ]; then + HANDLE=`cat /etc/iiab/openvpn_handle` fi +# DANGEROUS AS OF AUGUST 2018: +#if [ -z "$HANDLE" ]; then +# HANDLE=`cat /etc/iiab/iiab.ini | gawk \ +# '{ if((toupper($1) == "HANDLE") && ($2 == "=")) { print $3;}}'` +#fi if [ -f /etc/iiab/uuid ]; then UUID=`cat /etc/iiab/uuid` fi # start the daemon which will serve the handle on demand +# NEXT LINE OBSOLETE? August 2018 source /etc/init.d/functions SERVER=/usr/bin/ncat +# NEXT LINE OBSOLETE? August 2018 PID_FILE=/var/run/openvpn/announce.pid HANDLE=${HANDLE// /_} {% if is_debuntu %}