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

Merge branch 'openvpn-handle' of https://github.com/holta/iiab

Browse source
This commit is contained in:
root 2018-08-14 04:55:38 -04:00
commit 9e9298f726
2 changed files with 20 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

2
roles/openvpn/tasks/main.yml
View file

@ -41,7 +41,7 @@
- { src: 'client1.crt', dest: '/etc/openvpn/keys/client1.crt', mode: '0644' } - { src: 'client1.crt', dest: '/etc/openvpn/keys/client1.crt', mode: '0644' }
- { src: 'client1.key', dest: '/etc/openvpn/keys/client1.key', mode: '0600' } - { src: 'client1.key', dest: '/etc/openvpn/keys/client1.key', mode: '0600' }
- { src: 'announce', dest: '/etc/openvpn/scripts/announce', mode: '0755' } - { src: 'announce', dest: '/etc/openvpn/scripts/announce', mode: '0755' }
- { src: 'announcer', dest: '/etc/openvpn/scripts/announcer', mode: '0755' } - { src: 'announcer.j2', dest: '/etc/openvpn/scripts/announcer', mode: '0755' }
- { src: 'silence', dest: '/etc/openvpn/scripts/silence', mode: '0755' } - { src: 'silence', dest: '/etc/openvpn/scripts/silence', mode: '0755' }
- { src: 'xscenet.conf.j2', dest: '/etc/openvpn/xscenet.conf', mode: '0644' } - { src: 'xscenet.conf.j2', dest: '/etc/openvpn/xscenet.conf', mode: '0644' }
- { src: 'iiab-vpn.conf.in', dest: '/etc/openvpn/iiab-vpn.conf.in', mode: '0644' } - { src: 'iiab-vpn.conf.in', dest: '/etc/openvpn/iiab-vpn.conf.in', mode: '0644' }

28
roles/openvpn/templates/announcer → roles/openvpn/templates/announcer.j2
View file

@ -3,28 +3,30 @@
HANDLE= HANDLE=
UUID= UUID=
source /etc/iiab/iiab.env
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
source /etc/iiab/iiab.env
# DANGEROUS AS OF AUGUST 2018:
if [ -z "$HANDLE" ]; then
HANDLE=`cat /etc/iiab/iiab.ini | gawk \
'{ if((toupper($1) == "HANDLE") && ($2 == "=")) { print $3;}}'`
fi
fi fi
# DANGEROUS AS OF AUGUST 2018: HANDLE=${HANDLE// /_}
#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 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
# NEXT LINE OBSOLETE? August 2018 ID=`printf "HANDLE = %s|UUID = %s" $HANDLE $UUID`
PID_FILE=/var/run/openvpn/announce.pid
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 %}