tilecache: restrict cache control headers to osm.org only

[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 775f5ec6cea2702248aef5624ac48dbcd2e06bd3..e6fd9bdd621c71f693f383e75b3a6033cd89cd99 100644 (file)
--- a/cookbooks/squid/templates/default/squid.conf.erb
+++ b/cookbooks/squid/templates/default/squid.conf.erb
@@ -5,11 +5,19 @@ visible_hostname <%= node.name %>
 
 #FIXME - configurable
 cache_mem  <%= node[:squid][:cache_mem] %>
+<% if node[:squid][:version] > 2 -%>
+
+workers <%= node[:cpu][:total] %>
+
+error_log_languages off
+<% end -%>
 
 max_filedescriptors 98304
 
 #used by squidclient / munin
 http_port 3128
+#HTCP
+htcp_port 4827
 #ICP
 icp_port 3130
 log_icp_queries off
@@ -46,7 +54,14 @@ cache_replacement_policy heap LFUDA
 memory_replacement_policy heap GDSF
 
 server_persistent_connections on
+<% if node[:squid][:version] < 3 -%>
 persistent_request_timeout 1 minutes
+<% else -%>
+client_idle_pconn_timeout 1 minutes
+<% end -%>
+<% if node[:squid][:version] > 3 -%>
+pconn_lifetime 5 minutes
+<% end -%>
 
 negative_ttl 15 seconds
 half_closed_clients off
@@ -139,6 +154,7 @@ logfile_rotate 0
 #MUST BE LAST ACL
 #--------------
 http_access deny all
+htcp_access deny all
 icp_access deny all
 #--------------