Drop support for old Ubuntu versions from squid cookbook

[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 275f282068ed7db713169ab407fc31c5b7d7ba19..35b336cada2eed2794e54f9eeaf2ebe05f4d1802 100644 (file)
--- a/cookbooks/squid/templates/default/squid.conf.erb
+++ b/cookbooks/squid/templates/default/squid.conf.erb
@@ -9,6 +9,7 @@ max_filedescriptors 65536
 http_port 3128
 #ICP
 icp_port 3130
+log_icp_queries off
 
 #FIXME - configurable
 http_port 80 accel defaultsite=tile.openstreetmap.org tcpkeepalive=60,10,6 http11
@@ -20,6 +21,8 @@ cache_effective_group proxy
 cache_dir <%= node[:squid][:cache_dir] %>
 cache_swap_log /var/spool/squid/%s
 
+cache_mgr webmaster@openstreetmap.org
+
 quick_abort_min 0 KB
 quick_abort_max 0 KB
 
@@ -79,6 +82,11 @@ 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" %<st
+access_log /var/log/squid/zere.log zerelog
 
 access_log <%= node[:squid][:access_log] %>
 cache_log /var/log/squid/cache.log
@@ -89,7 +97,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