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 iiab-vpn

Browse source
This commit is contained in:
A Holt 2018-04-29 02:34:11 -04:00 • committed by GitHub
parent 66c4132c6d
commit 440b21102b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
roles/openvpn/templates/iiab-vpn
View file

@ -3,7 +3,7 @@
if [ ! -f "/etc/openvpn/iiab-vpn.conf" ]; then if [ ! -f "/etc/openvpn/iiab-vpn.conf" ]; then
VPNCONFIG='party-line.conf' VPNCONFIG='party-line.conf'
VPNIP=10.8.0.1 VPNIP={{ openvpn_server_virtual_ip }}
else else
# expect the sourced file to set the above variables # expect the sourced file to set the above variables
source /etc/openvpn/iiab-vpn.conf source /etc/openvpn/iiab-vpn.conf
@ -23,9 +23,9 @@ case $1 in
"status") "status")
pid=`ps -e|grep openvpn` pid=`ps -e|grep openvpn`
if [ -z "$pid" ]; then if [ -z "$pid" ]; then
echo "The openvpn process is not running" echo "The OpenVPN process is not running"
else else
echo "Openvpn is running with id $pid" echo "OpenVPN is running with id $pid"
ip=`ifconfig tun | gawk '(/netmask /) {print( $2);}'` ip=`ifconfig tun | gawk '(/netmask /) {print( $2);}'`
echo "Local vpn tunnel address is $ip" echo "Local vpn tunnel address is $ip"
fi fi
@ -41,7 +41,7 @@ if [ $PASSWORDS_ENABLED -eq 0 ];then
case $1 in case $1 in
"test" | "unsafe") ;; "test" | "unsafe") ;;
*) *)
echo "Openvpn is only safe when public/private keys are used" echo "OpenVPN is only safe when public/private keys are used"
echo " And when passwords are turned off in /etc/ssh/sshd_conf" echo " And when passwords are turned off in /etc/ssh/sshd_conf"
exit 1 exit 1
esac esac
@ -76,8 +76,7 @@ case $cmd in
echo "Stopping any openvpn instance" echo "Stopping any openvpn instance"
killall openvpn killall openvpn
sleep 10 sleep 10
echo "Starting openvpn and waiting 10 seconds for daemon to become r echo "Starting OpenVPN and waiting 10 seconds for daemon to become ready"
eady"
openvpn --cd $dir --daemon --config $VPNCONFIG openvpn --cd $dir --daemon --config $VPNCONFIG
fi fi
sleep 10 sleep 10
@ -88,5 +87,6 @@ eady"
else else
echo "vpn connection failed" echo "vpn connection failed"
fi fi
;; ;;
esac esac