1
0
Fork 0
mirror of https://github.com/iiab/iiab.git synced 2025-03-09 15:40:17 +00:00

Update iiab-vpn

This commit is contained in:
A Holt 2018-04-29 02:20:53 -04:00 committed by GitHub
parent 89b893ece0
commit 4f777e66b6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1,8 +1,9 @@
#!/bin/sh #!/bin/bash
# script to manage openvpn # script to manage openvpn
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={{ openvpn_server_virtual_ip }} VPNIP=10.8.0.1
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
@ -30,7 +31,6 @@ case $1 in
fi fi
exit 0 exit 0
;; ;;
esac esac
# we'd like for passwords authentication to be turned off # we'd like for passwords authentication to be turned off
@ -41,7 +41,6 @@ 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
@ -77,7 +76,8 @@ 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 ready" echo "Starting openvpn and waiting 10 seconds for daemon to become r
eady"
openvpn --cd $dir --daemon --config $VPNCONFIG openvpn --cd $dir --daemon --config $VPNCONFIG
fi fi
sleep 10 sleep 10
@ -88,6 +88,5 @@ case $cmd in
else else
echo "vpn connection failed" echo "vpn connection failed"
fi fi
;; ;;
esac esac