put in wait for tunnel before execute extip

binhex · Jul 31, 2017 · 9e1e9a7 · 9e1e9a7
1 parent be1af25
commit 9e1e9a7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/run/root/getvpnextip.sh b/run/root/getvpnextip.sh
@@ -8,6 +8,9 @@ retry_count=30
 # remove previous run output file
 rm -f /home/nobody/vpn_external_ip.txt
 
+# wait for vpn tunnel to come up before proceeding
+source /home/nobody/getvpnip.sh
+
 while true; do
 
 	external_ip="$(dig TXT +short o-o.myaddr.l.google.com @${pri_external_ip_ns} | tr -d '"')"

diff --git a/run/root/openvpn.sh b/run/root/openvpn.sh
@@ -1,12 +1,12 @@
 #!/bin/bash
 
 # define common command lne parameters for openvpn
-openvpn_cli="/usr/bin/openvpn --cd /config/openvpn --config ${VPN_CONFIG} --daemon --reneg-sec 0 --mute-replay-warnings --auth-nocache --keepalive 10 60 --setenv VPN_PROV ${VPN_PROV} --setenv DEBUG ${DEBUG} --script-security 2 --up /root/openvpnup.sh --up-delay --up-restart --writepid /root/openvpn.pid"
+openvpn_cli="/usr/bin/openvpn --cd /config/openvpn --config ${VPN_CONFIG} --daemon --reneg-sec 0 --mute-replay-warnings --auth-nocache --keepalive 10 60 --setenv VPN_PROV ${VPN_PROV} --setenv DEBUG ${DEBUG} --setenv VPN_DEVICE_TYPE ${VPN_DEVICE_TYPE} --script-security 2 --up /root/openvpnup.sh --up-delay --up-restart --writepid /root/openvpn.pid"
 
 if [[ "${VPN_PROV}" == "pia" ]]; then
 
-	# add additional flags to pass credentials and ignore local-remote warnings
-	openvpn_cli="${openvpn_cli} --setenv STRICT_PORT_FORWARD ${STRICT_PORT_FORWARD} --auth-user-pass credentials.conf --disable-occ --remap-usr1 SIGHUP --log-append /dev/stdout"
+	# add pia specific flags
+	openvpn_cli="${openvpn_cli} --setenv STRICT_PORT_FORWARD ${STRICT_PORT_FORWARD} --disable-occ --remap-usr1 SIGHUP --log-append /dev/stdout"
 
 fi