refactoring, permissions

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
 

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"

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

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
 

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..."

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

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"

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"