Remove some redundant options from squid 3 configuration

[chef.git] / cookbooks / squid / templates / default / squid.conf.erb

diff --git a/cookbooks/squid/templates/default/squid.conf.erb b/cookbooks/squid/templates/default/squid.conf.erb
index 7236a4dd2780a0c025ac4a83c12374ebc3e1249c..89f8124836076e32855985567ad85614cef43f46 100644 (file)
--- a/cookbooks/squid/templates/default/squid.conf.erb
+++ b/cookbooks/squid/templates/default/squid.conf.erb
@@ -12,14 +12,23 @@ icp_port 3130
 log_icp_queries off
 
 #FIXME - configurable
+<% if node[:squid][:version] == "2" -%>
 http_port 80 accel defaultsite=tile.openstreetmap.org tcpkeepalive=60,10,6 http11
+<% else -%>
+http_port 80 accel defaultsite=tile.openstreetmap.org tcpkeepalive=60,10,6
+
+#prefer IPv4 until everything is upgraded
+dns_v4_first on
+<% end -%>
 
 cache_effective_user proxy
 cache_effective_group proxy
 
 #FIXME - configurable
 cache_dir <%= node[:squid][:cache_dir] %>
+<% if node[:squid][:version] == "2" -%>
 cache_swap_log /var/spool/squid/%s
+<% end -%>
 
 cache_mgr webmaster@openstreetmap.org
 
@@ -39,7 +48,11 @@ persistent_request_timeout 1 minutes
 
 negative_ttl 15 seconds
 half_closed_clients off
+<% if node[:squid][:version] == "2" -%>
 pipeline_prefetch on
+<% else -%>
+pipeline_prefetch 1
+<% end -%>
 
 read_timeout 90 seconds
 request_timeout 90 seconds
@@ -47,14 +60,18 @@ connect_timeout 20 seconds
 client_lifetime 1 hours
 
 collapsed_forwarding on
+<% if node[:squid][:version] == "2" -%>
 refresh_stale_hit 300 seconds
+<% end -%>
 
 #Recommended minimum configuration:
 #----------------------------------
+<% if node[:squid][:version] == "2" -%>
 acl all src all
 acl manager proto cache_object
 acl localhost src 127.0.0.1/32
 acl to_localhost dst 127.0.0.0/8
+<% end -%>
 acl SSL_ports port 443
 acl Safe_ports port 80          # http
 acl Safe_ports port 21          # ftp
@@ -84,11 +101,13 @@ http_access deny purge
 forwarded_for on
 follow_x_forwarded_for allow localhost
 
-#Loggin used for analysis
-logformat zerelog %ts.%03tu %rp "%{Etag}<h" %>a "%{User-Agent}>h" %<st
-access_log /var/log/squid/zere.log zerelog
-
+<% if node[:squid][:version] == "2" -%>
+logformat openstreetmap %ts.%03tu %tr %>a %Ss/%03Hs %<st %rm %rp %Sh/%<A %mt "%{Referer}>h" "%{User-Agent}>h"
 access_log <%= node[:squid][:access_log] %>
+<% else -%>
+logformat openstreetmap %ts.%03tu %tr %>a %Ss/%03>Hs %<st %rm %>rp %Sh/%<A %mt "%{Referer}>h" "%{User-Agent}>h"
+access_log daemon:<%= node[:squid][:access_log] %>
+<% end -%>
 cache_log /var/log/squid/cache.log
 cache_store_log none
 buffered_logs on
@@ -97,7 +116,7 @@ strip_query_terms off
 
 digest_generation on
 
-refresh_pattern .              0       20%     4320
+refresh_pattern .              0       50%     8640
 
 #ZERO required for logrotate to work properly
 logfile_rotate 0