Merge branch 'master' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x

This commit is contained in:
Arne Fitzenreiter
2009-02-19 23:41:51 +01:00
3 changed files with 5 additions and 4 deletions

View File

@@ -9,12 +9,12 @@ etc/squid/squid.conf
#etc/squid/squid.conf.default
srv/web/ipfire/html/proxy.pac
srv/web/ipfire/html/wpad.dat
srv/web/ipfire/cgi-bin/cachemgr.cgi
#usr/bin/RunCache
#usr/bin/cossdump
usr/bin/squidclient
#usr/lib/squid
usr/lib/squid/auth
usr/lib/squid/cachemgr.cgi
usr/lib/squid/diskd-daemon
#usr/lib/squid/errors
#usr/lib/squid/errors.ipfire

View File

@@ -3,9 +3,9 @@
/usr/local/bin/backupctrl exclude >/dev/null 2>&1
/etc/init.d/squid stop
extract_files
[ -e /var/ipfire/qos/enable ] && qosctrl stop
qosctrl generate
[ -e /var/ipfire/qos/enable ] && qosctrl start
[ -e /var/ipfire/qos/enable ] && /usr/local/bin/qosctrl stop
/usr/local/bin/qosctrl generate
[ -e /var/ipfire/qos/enable ] && /usr/local/bin/qosctrl start
perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
sysctl -p
mv /etc/squid/cachemgr.conf /var/ipfire/proxy/cachemgr.conf

View File

@@ -160,6 +160,7 @@ usr/sbin/winbindd
#usr/share/man/man8/vfs_readonly.8
#usr/share/man/man8/vfs_recycle.8
#usr/share/man/man8/vfs_shadow_copy.8
#usr/share/man/man8/vfs_shadow_copy2.8
#usr/share/man/man8/vfs_smb_traffic_analyzer.8
#usr/share/man/man8/vfs_streams_depot.8
#usr/share/man/man8/vfs_streams_xattr.8