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 918c7b5314d5fed1a35f1bd2de1345f4addd47ba..e6fd9bdd621c71f693f383e75b3a6033cd89cd99 100644 (file)
--- a/cookbooks/squid/templates/default/squid.conf.erb
+++ b/cookbooks/squid/templates/default/squid.conf.erb
@@ -1,32 +1,42 @@
 # DO NOT EDIT - This file is being maintained by Chef
 
 # DO NOT EDIT - This file is being maintained by Chef
 

+#configure host name
+visible_hostname <%= node.name %>
+

 #FIXME - configurable
 cache_mem  <%= node[:squid][:cache_mem] %>
 #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
 
 max_filedescriptors 98304
 
 #used by squidclient / munin
 http_port 3128

+#HTCP
+htcp_port 4827

 #ICP
 icp_port 3130
 log_icp_queries off
 
 #FIXME - configurable
 #ICP
 icp_port 3130
 log_icp_queries off
 
 #FIXME - configurable

-<% if node[:squid][:version] == "2" -%>
+<% if node[:squid][:version] < 3 -%>

 http_port 80 accel defaultsite=tile.openstreetmap.org tcpkeepalive=60,10,6 http11
 <% else -%>
 http_port 80 accel no-vhost defaultsite=tile.openstreetmap.org tcpkeepalive=60,10,6
 http_port 80 accel defaultsite=tile.openstreetmap.org tcpkeepalive=60,10,6 http11
 <% else -%>
 http_port 80 accel no-vhost 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
 <% end -%>
 
 cache_effective_user proxy
 cache_effective_group proxy
 
 #FIXME - configurable

-cache_dir <%= node[:squid][:cache_dir] %>
-<% if node[:squid][:version] == "2" -%>
+<% Array(node[:squid][:cache_dir]).each do |cache_dir| -%>
+cache_dir <%= cache_dir %>
+<% end -%>
+<% if node[:squid][:version] < 3 -%>

 cache_swap_log /var/spool/squid/%s
 <% end -%>
 
 cache_swap_log /var/spool/squid/%s
 <% end -%>
 


@@ -44,11 +54,18 @@ cache_replacement_policy heap LFUDA
 memory_replacement_policy heap GDSF
 
 server_persistent_connections on
 memory_replacement_policy heap GDSF
 
 server_persistent_connections on

+<% if node[:squid][:version] < 3 -%>

 persistent_request_timeout 1 minutes
 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
 
 negative_ttl 15 seconds
 half_closed_clients off

-<% if node[:squid][:version] == "2" -%>
+<% if node[:squid][:version] < 3 -%>

 pipeline_prefetch on
 <% else -%>
 pipeline_prefetch 1
 pipeline_prefetch on
 <% else -%>
 pipeline_prefetch 1


@@ -59,14 +76,16 @@ request_timeout 90 seconds
 connect_timeout 20 seconds
 client_lifetime 1 hours
 
 connect_timeout 20 seconds
 client_lifetime 1 hours
 

+<% if node[:squid][:version] < 4 -%>

 collapsed_forwarding on
 collapsed_forwarding on

-<% if node[:squid][:version] == "2" -%>
+<% end -%>
+<% if node[:squid][:version] < 3 -%>

 refresh_stale_hit 300 seconds
 <% end -%>
 
 #Recommended minimum configuration:
 #----------------------------------
 refresh_stale_hit 300 seconds
 <% end -%>
 
 #Recommended minimum configuration:
 #----------------------------------

-<% if node[:squid][:version] == "2" -%>
+<% if node[:squid][:version] < 3 -%>

 acl all src all
 acl manager proto cache_object
 acl localhost src 127.0.0.1/32
 acl all src all
 acl manager proto cache_object
 acl localhost src 127.0.0.1/32


@@ -101,7 +120,7 @@ http_access deny purge
 forwarded_for on
 follow_x_forwarded_for allow localhost
 
 forwarded_for on
 follow_x_forwarded_for allow localhost
 

-<% if node[:squid][:version] == "2" -%>
+<% if node[:squid][:version] < 3 -%>

 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/%03Hs %<st %rm %rp %Sh/%<A %mt "%{Referer}>h" "%{User-Agent}>h"
 access_log <%= node[:squid][:access_log] %>
 <% else -%>


@@ -113,7 +132,7 @@ cache_store_log none
 buffered_logs on
 client_db off
 strip_query_terms off
 buffered_logs on
 client_db off
 strip_query_terms off

-<% if node[:squid][:version] == "3" -%>
+<% if node[:squid][:version] > 2 -%>

 # Work around bug in squid 3 that causes log_fqdn to be
 # turned on by some of the (unused by us) default formats:
 # http://lists.squid-cache.org/pipermail/squid-users/2016-February/thread.html#8999
 # Work around bug in squid 3 that causes log_fqdn to be
 # turned on by some of the (unused by us) default formats:
 # http://lists.squid-cache.org/pipermail/squid-users/2016-February/thread.html#8999


@@ -135,6 +154,7 @@ logfile_rotate 0
 #MUST BE LAST ACL
 #--------------
 http_access deny all
 #MUST BE LAST ACL
 #--------------
 http_access deny all

+htcp_access deny all

 icp_access deny all
 #--------------
 
 icp_access deny all
 #--------------