Merge branch 'master' into next

This commit is contained in:
Arne Fitzenreiter
2011-05-23 21:52:13 +02:00
3 changed files with 7 additions and 4 deletions

View File

@@ -18,8 +18,8 @@ MaxKeepAliveRequests 100
KeepAliveTimeout 15
MinSpareServers 1
MaxSpareServers 2
StartServers 2
MaxSpareServers 10
StartServers 1
MaxClients 10
MaxRequestsPerChild 100

View File

@@ -1,4 +1,5 @@
etc/system-release
etc/httpd/conf/server-tuning.conf
etc/rc.d/init.d/squid
etc/rc.d/init.d/waitdrives
etc/rc.d/rcsysinit.d/S19waitdrives
@@ -10,6 +11,7 @@ srv/web/ipfire/cgi-bin/logs.cgi/log.dat
srv/web/ipfire/cgi-bin/ovpnmain.cgi
srv/web/ipfire/cgi-bin/pppsetup.cgi
srv/web/ipfire/cgi-bin/proxy.cgi
srv/web/ipfire/cgi-bin/qos.cgi
srv/web/ipfire/cgi-bin/services.cgi
srv/web/ipfire/cgi-bin/vpnmain.cgi
var/ipfire/langs/de.pl