diff --git a/ipsec/autostart.sh b/ipsec/autostart.sh old mode 100644 new mode 100755 diff --git a/ipsec/checkserver.sh b/ipsec/checkserver.sh old mode 100644 new mode 100755 diff --git a/ipsec/env.sh b/ipsec/env.sh index 8784278..e1d2e84 100755 --- a/ipsec/env.sh +++ b/ipsec/env.sh @@ -6,7 +6,6 @@ XL2TPDCONFIG=/etc/xl2tpd/xl2tpd.conf PPPCONFIG=/etc/ppp/options.xl2tpd CHAPSECRETS=/etc/ppp/chap-secrets IPTABLES=/etc/iptables.rules -RCLOCAL=/etc/rc.local SECRETSFILE=/etc/ipsec.secrets CHECKSERVER=/etc/xl2tpd/checkserver.sh diff --git a/ipsec/install.sh b/ipsec/install.sh index 104fa62..6d19bc3 100755 --- a/ipsec/install.sh +++ b/ipsec/install.sh @@ -10,7 +10,7 @@ fi echo echo "Installing strongSwan and xl2tp server..." -apt-get install strongswan xl2tpd +apt-get install strongswan xl2tpd cron iptables procps ADDUSER="no" ANSUSER="yes" diff --git a/openvpn/autostart.sh b/openvpn/autostart.sh index df3bc78..3a4353d 100755 --- a/openvpn/autostart.sh +++ b/openvpn/autostart.sh @@ -17,7 +17,7 @@ if [ $? -ne 0 ]; then echo "@reboot $RESTOREPATH <$IPTABLES >/dev/null 2>&1" >> $TMPFILE fi -OPENVPNPRESENTS=$(grep "$CHECKSERVER" $TMPFILE) +SERVERSPRESENTS=$(grep "$CHECKSERVER" $TMPFILE) if [ $? -ne 0 ]; then echo "*/5 * * * * $CHECKSERVER >/dev/null 2>&1" >> $TMPFILE fi diff --git a/openvpn/env.sh b/openvpn/env.sh index 8ed9e19..0ad5932 100755 --- a/openvpn/env.sh +++ b/openvpn/env.sh @@ -5,7 +5,6 @@ OPENVPNDIR=/etc/openvpn OPENVPNCONFIG=$OPENVPNDIR/openvpn-server.conf CADIR=$OPENVPNDIR/easy-rsa IPTABLES=/etc/iptables.rules -RCLOCAL=/etc/rc.local NOBODYGROUP=nogroup CHECKSERVER=$OPENVPNDIR/checkserver.sh diff --git a/openvpn/install.sh b/openvpn/install.sh index 1946b1d..e7c9e48 100755 --- a/openvpn/install.sh +++ b/openvpn/install.sh @@ -12,7 +12,7 @@ fi echo echo "Installing OpenVPN..." -apt-get install openvpn easy-rsa cron +apt-get install openvpn easy-rsa cron iptables procps echo echo "Configuring routing..." diff --git a/pptp/autostart.sh b/pptp/autostart.sh old mode 100644 new mode 100755 index a55811f..3a4353d --- a/pptp/autostart.sh +++ b/pptp/autostart.sh @@ -17,7 +17,7 @@ if [ $? -ne 0 ]; then echo "@reboot $RESTOREPATH <$IPTABLES >/dev/null 2>&1" >> $TMPFILE fi -PPTPDPRESENTS=$(grep "$CHECKSERVER" $TMPFILE) +SERVERSPRESENTS=$(grep "$CHECKSERVER" $TMPFILE) if [ $? -ne 0 ]; then echo "*/5 * * * * $CHECKSERVER >/dev/null 2>&1" >> $TMPFILE fi diff --git a/pptp/checkserver.sh b/pptp/checkserver.sh old mode 100644 new mode 100755 diff --git a/pptp/env.sh b/pptp/env.sh index aa13dd6..e3c8a85 100755 --- a/pptp/env.sh +++ b/pptp/env.sh @@ -5,7 +5,6 @@ PPTPDCONFIG=/etc/pptpd.conf PPTPOPTIONS=/etc/ppp/options.pptp CHAPSECRETS=/etc/ppp/chap-secrets IPTABLES=/etc/iptables.rules -RCLOCAL=/etc/rc.local CHECKSERVER=/etc/ppp/checkserver.sh LOCALPREFIX="172.16" diff --git a/pptp/install.sh b/pptp/install.sh index 1147995..5e4a61e 100755 --- a/pptp/install.sh +++ b/pptp/install.sh @@ -10,7 +10,7 @@ fi echo echo "Installing PPTP server..." -apt-get install pptpd cron +apt-get install pptpd cron iptables procps ADDUSER="no" ANSUSER="yes"