X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/c5e6a12d2f2a66c52fa757c03fa2808859224de0..5130b3265641a18c3aff2908b838e94fe4cf0d05:/cookbooks/squid/templates/default/squid.conf.erb?ds=inline

diff --git a/cookbooks/squid/templates/default/squid.conf.erb b/cookbooks/squid/templates/default/squid.conf.erb
index 16c7b4d4d..b92ed1ec3 100644
--- a/cookbooks/squid/templates/default/squid.conf.erb
+++ b/cookbooks/squid/templates/default/squid.conf.erb
@@ -12,14 +12,25 @@ 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
 
 quick_abort_min 0 KB
 quick_abort_max 0 KB
@@ -37,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
@@ -80,12 +95,15 @@ http_access allow purge purge_hosts
 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"
-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
@@ -94,7 +112,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