- updated to 4.13

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

diff --git a/squid.conf.patch b/squid.conf.patch
index 833b0daf4fb770cede12baa117bf8834450ff672..d9455bb66e782b11682c2bda22f0f5e8c8de74b9 100644 (file)
--- a/squid.conf.patch
+++ b/squid.conf.patch
@@ -1,58 +1,34 @@
---- squid.conf Sun Feb 11 12:02:37 2001
-+++ squid.conf.default Sun Feb 11 12:02:38 2001
-@@ -460,6 +460,9 @@
- #     will be created under each first-level directory.  The default
- #     is 256.
- #
-+#     NOTE: Remeber to initialize cache directories:
-+#           squid -z -F
-+#
- #cache_dir ufs /var/cache/squid 100 16 256
- 
- #  TAG: cache_access_log
-@@ -467,6 +470,7 @@
- #     every HTTP and ICP queries received.
- #
- #cache_access_log /var/log/squid/access
-+cache_access_log /var/log/squid/access.log
- 
- #  TAG: cache_log
- #     Cache logging file. This is where general information about
-@@ -474,6 +478,7 @@
- #     logged to this file with the "debug_options" tag below.
- #
- #cache_log /var/log/squid/cache
-+cache_log /var/log/squid/cache.log
+--- 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
  
- #  TAG: cache_store_log
- #     Logs the activities of the storage manager.  Shows which
-@@ -483,6 +488,7 @@
- #     disable it.
  #
- #cache_store_log /var/log/squid/store
-+cache_store_log /var/log/squid/store.log
+ # INSERT YOUR OWN RULE(S) HERE TO ALLOW ACCESS FROM YOUR CLIENTS
+@@ -65,7 +65,8 @@
+ hierarchy_stoplist cgi-bin ?
  
- #  TAG: cache_swap_log
- #     Location for the cache "swap.log."  This log file holds the
-@@ -1282,6 +1288,8 @@
- #
- #cache_effective_user nobody
- #cache_effective_group nogroup
-+cache_effective_user squid 
-+cache_effective_group squid
+ # 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
  
- #  TAG: visible_hostname
- #     If you want to present a special hostname in error messages, etc,
-@@ -1416,7 +1424,12 @@
- #     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.
- #logfile_rotate 10
+ # 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
- 
- #  TAG: append_domain
- #     Appends local domain name to hostnames without any dots in
++
++cache_effective_user squid
++cache_effective_group squid