Go back to serving http tiles directly from squid for now

[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 8bf4ef100c282a99d497fd72511936934d2bc7e4..f290f730d22b16f7f1174f435a03dc0e3552d064 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,7 +82,9 @@ http_access allow purge purge_hosts
 http_access deny purge
 
 forwarded_for on
+follow_x_forwarded_for allow localhost
 
+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] %>
 cache_log /var/log/squid/cache.log
 cache_store_log none
@@ -87,9 +92,9 @@ buffered_logs on
 client_db off
 strip_query_terms off
 
-digest_generation off
+digest_generation on
 
-refresh_pattern .              0       20%     4320
+refresh_pattern .              0       50%     8640
 
 #ZERO required for logrotate to work properly
 logfile_rotate 0