- updated to 4.13

[packages/squid.git] / squid.conf.patch

diff --git a/squid.conf.patch b/squid.conf.patch
index 93cc11f4074bc96c669ac35d25ad69e155609f17..d9455bb66e782b11682c2bda22f0f5e8c8de74b9 100644 (file)
--- a/squid.conf.patch
+++ b/squid.conf.patch
@@ -1,50 +1,34 @@
---- squid.conf.default 2004-08-24 11:51:14.723512904 +0200
-+++ squid.conf 2004-08-24 11:51:29.986192624 +0200
-@@ -688,8 +688,12 @@
- #     Note that for coss, max-size must be less than COSS_MEMBUF_SZ
- #     (hard coded at 1 MB).
- #
-+#     NOTE: Remeber to initialize cache directories:
-+#           squid -z -F
-+#
- #Default:
- # cache_dir ufs /var/cache/squid 100 16 256
-+cache_dir diskd /var/cache/squid 100 16 256
- 
- #  TAG: cache_access_log
- #     Logs the client request activity.  Contains an entry for
-@@ -2025,6 +2030,8 @@
- #
- #Default:
- # cache_effective_user nobody
-+cache_effective_user squid
-+cache_effective_group squid
- 
- #  TAG: visible_hostname
- #     If you want to present a special hostname in error messages, etc,
-@@ -2200,8 +2207,14 @@
- #     in the habit of using 'squid -k rotate' instead of 'kill -USR1
- #     <pid>'.
- #
-+#     Default value for logfile_rotate is 10, but PLD uses 'logrotate',
-+#     which is more configurable, to perform this task. Setting this
-+#     value to '0' disables built-in log rotation and allows 'logrotate'
-+#     to do it's job.
-+#
- #Default:
- # logfile_rotate 10
-+logfile_rotate 0
- 
- #  TAG: append_domain
- #     Appends local domain name to hostnames without any dots in
---- squid.conf~        2005-10-20 13:15:15.000000000 +0300
-+++ squid.conf 2005-10-20 13:15:16.000000000 +0300
-@@ -1862,7 +1862,7 @@
+--- squid.conf.default 2010-09-08 13:45:20.000000000 +0200
++++ squid.conf 2010-09-08 17:29:24.765819003 +0200
+@@ -43,7 +43,7 @@
  # We strongly recommend the following be uncommented to protect innocent
  # web applications running on the proxy server who think the only
  # one who can access services on "localhost" is a local user
 -#http_access deny to_localhost
 +http_access deny to_localhost
+ 
  #
  # INSERT YOUR OWN RULE(S) HERE TO ALLOW ACCESS FROM YOUR CLIENTS
+@@ -65,7 +65,8 @@
+ hierarchy_stoplist cgi-bin ?
+ 
+ # Uncomment and adjust the following to add a disk cache directory.
+-#cache_dir ufs /var/cache/squid 100 16 256
++# NOTE: Remeber to initialize cache directories: squid -z -F
++cache_dir diskd /var/cache/squid 100 16 256
  
+ # Leave coredumps in the first cache dir
+ coredump_dir /var/cache/squid
+@@ -75,3 +76,12 @@
+ refresh_pattern ^gopher:      1440    0%      1440
+ refresh_pattern -i (/cgi-bin/|\?) 0   0%      0
+ refresh_pattern .             0       20%     4320
++
++# Default value for logfile_rotate is 10, but PLD uses 'logrotate',
++# which is more configurable, to perform this task. Setting this
++# value to '0' disables built-in log rotation and allows 'logrotate'
++# to do it's job.
++logfile_rotate 0
++
++cache_effective_user squid
++cache_effective_group squid