external/iiab
1
0
Fork 0
mirror of https://github.com/iiab/iiab.git synced 2025-03-09 15:40:17 +00:00
Code Issues Releases Wiki Activity

Update announcer.j2

Browse source
This commit is contained in:
A Holt 2018-08-14 04:55:15 -04:00 • committed by GitHub
parent e3cb7f88b7
commit 212ad0d625
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

15
roles/openvpn/templates/announcer.j2
View file

@ -3,7 +3,6 @@
HANDLE= HANDLE=
UUID= UUID=
if [ -f /etc/iiab/openvpn_handle ]; then if [ -f /etc/iiab/openvpn_handle ]; then
HANDLE=`cat /etc/iiab/openvpn_handle` HANDLE=`cat /etc/iiab/openvpn_handle`
else else
@ -14,18 +13,20 @@ else
'{ if((toupper($1) == "HANDLE") && ($2 == "=")) { print $3;}}'` '{ if((toupper($1) == "HANDLE") && ($2 == "=")) { print $3;}}'`
fi fi
fi fi
HANDLE=${HANDLE// /_}
if [ -f /etc/iiab/uuid ]; then if [ -f /etc/iiab/uuid ]; then
UUID=`cat /etc/iiab/uuid` UUID=`cat /etc/iiab/uuid`
fi fi
# start the daemon which will serve the handle on demand # start the daemon which will serve the handle on demand
# NEXT LINE OBSOLETE? August 2018
source /etc/init.d/functions
SERVER=/usr/bin/ncat SERVER=/usr/bin/ncat
PID_FILE=/var/run/openvpn/announce.pid ID=`printf "HANDLE = %s|UUID = %s" $HANDLE $UUID`
HANDLE=${HANDLE// /_}
{% if is_debuntu %} {% if is_debuntu %}
ID=`printf "HANDLE = %s|UUID = %s|" $HANDLE $UUID` #ID=`printf "HANDLE = %s|UUID = %s|" $HANDLE $UUID`
$SERVER -l -k -p1705 --exec "/bin/echo $ID" & $SERVER -l -k -p1705 --exec "/bin/echo $ID" &
{% else %} {% else %}
daemon --pidfile=${PID_FILE} $SERVER "-l -k -p1705 --exec \"/usr/bin/echo $(printf 'HANDLE = %s|UUID = %s' $HANDLE $UUID)\"" & source /etc/init.d/functions
PID_FILE=/var/run/openvpn/announce.pid
daemon --pidfile=${PID_FILE} $SERVER "-l -k -p1705 --exec \"/usr/bin/echo $ID\"" &
#daemon --pidfile=${PID_FILE} $SERVER "-l -k -p1705 --exec \"/usr/bin/echo $(printf 'HANDLE = %s|UUID = %s' $HANDLE $UUID)\"" &
{% endif %} {% endif %}