Disable gpximport, statistics and cleanup roles on spike-04

[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 72ff9774069139cda463e110ffa36fee5234e6b1..7236a4dd2780a0c025ac4a83c12374ebc3e1249c 100644 (file)
--- a/cookbooks/squid/templates/default/squid.conf.erb
+++ b/cookbooks/squid/templates/default/squid.conf.erb
@@ -6,7 +6,10 @@ cache_mem  <%= node[:squid][:cache_mem] %>
 max_filedescriptors 65536
 
 #used by squidclient / munin
-http_port 127.0.0.1:3128
+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
@@ -18,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
 
@@ -77,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
@@ -85,7 +95,7 @@ buffered_logs on
 client_db off
 strip_query_terms off
 
-digest_generation off
+digest_generation on
 
 refresh_pattern .              0       20%     4320