Merge branch 'master' into perl_5.12.2

This commit is contained in:
Arne Fitzenreiter
2011-01-22 13:01:17 +01:00
7 changed files with 32 additions and 11 deletions

View File

@@ -6,3 +6,6 @@ srv/web/ipfire/cgi-bin/pppsetup.cgi
srv/web/ipfire/cgi-bin/proxy.cgi
srv/web/ipfire/cgi-bin/vpnmain.cgi
usr/sbin/updxlrator
var/ipfire/outgoing/bin/outgoingfw.pl
srv/web/ipfire/cgi-bin/logs.cgi/firewalllog.dat
usr/local/bin/vpn-watch

View File

@@ -28,6 +28,8 @@
#Stop services
echo Stopping Proxy
/etc/init.d/squid stop 2>/dev/null
echo Stopping vpn-watch
killall vpn-watch
#
#Extract files
@@ -37,6 +39,10 @@ extract_files
#Start services
echo Starting Proxy
/etc/init.d/squid start 2>/dev/null
echo Rewriting Outgoing FW Rules
/var/ipfire/outgoing/bin/outgoingfw.pl
echo Starting vpn-watch
/usr/local/bin/vpn-watch &
#
#Update Language cache