Configure host name for squid caches

[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 53f84f888014a811136f486ba65f083b72031b20..0b8189d3308cb8e38ca810c4e6a03bc79e7bfff9 100644 (file)
--- a/cookbooks/squid/templates/default/squid.conf.erb
+++ b/cookbooks/squid/templates/default/squid.conf.erb
@@ -1,9 +1,12 @@
 # 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] %>
 

-max_filedescriptors 65536
+max_filedescriptors 98304

 
 #used by squidclient / munin
 http_port 3128
 
 #used by squidclient / munin
 http_port 3128


@@ -12,14 +15,25 @@ icp_port 3130
 log_icp_queries off
 
 #FIXME - configurable
 log_icp_queries off
 
 #FIXME - configurable

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

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

-cache_dir <%= node[:squid][:cache_dir] %>
+<% 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
 cache_swap_log /var/spool/squid/%s

+<% end -%>

 
 cache_mgr webmaster@openstreetmap.org
 
 
 cache_mgr webmaster@openstreetmap.org
 


@@ -39,7 +53,11 @@ persistent_request_timeout 1 minutes
 
 negative_ttl 15 seconds
 half_closed_clients off
 
 negative_ttl 15 seconds
 half_closed_clients off

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

 pipeline_prefetch on
 pipeline_prefetch on

+<% else -%>
+pipeline_prefetch 1
+<% end -%>

 
 read_timeout 90 seconds
 request_timeout 90 seconds
 
 read_timeout 90 seconds
 request_timeout 90 seconds


@@ -47,14 +65,18 @@ connect_timeout 20 seconds
 client_lifetime 1 hours
 
 collapsed_forwarding on
 client_lifetime 1 hours
 
 collapsed_forwarding on

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

 refresh_stale_hit 300 seconds
 refresh_stale_hit 300 seconds

+<% end -%>

 
 #Recommended minimum configuration:
 #----------------------------------
 
 #Recommended minimum configuration:
 #----------------------------------

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

 acl all src all
 acl manager proto cache_object
 acl localhost src 127.0.0.1/32
 acl to_localhost dst 127.0.0.0/8
 acl all src all
 acl manager proto cache_object
 acl localhost src 127.0.0.1/32
 acl to_localhost dst 127.0.0.0/8

+<% end -%>

 acl SSL_ports port 443
 acl Safe_ports port 80          # http
 acl Safe_ports port 21          # ftp
 acl SSL_ports port 443
 acl Safe_ports port 80          # http
 acl Safe_ports port 21          # ftp


@@ -82,21 +104,31 @@ http_access allow purge purge_hosts
 http_access deny purge
 
 forwarded_for on
 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
-
+<% 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] %>
 access_log <%= node[:squid][:access_log] %>

+<% else -%>
+logformat openstreetmap %ts.%03tu %tr %>a %Ss/%03>Hs %<st %rm %>rp %Sh/%<A %mt "%{Referer}>h" "%{User-Agent}>h"
+access_log daemon:<%= node[:squid][:access_log] %>
+<% end -%>

 cache_log /var/log/squid/cache.log
 cache_store_log none
 buffered_logs on
 client_db off
 strip_query_terms off
 cache_log /var/log/squid/cache.log
 cache_store_log none
 buffered_logs on
 client_db off
 strip_query_terms off

+<% 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
+url_rewrite_extras "%>a %un %>rm myip=%la myport=%lp"
+store_id_extras "%>a %un %>rm myip=%la myport=%lp"
+<% end -%>

 
 digest_generation on
 
 
 digest_generation on
 

-refresh_pattern .              0       20%     4320
+refresh_pattern .              0       50%     8640

 
 #ZERO required for logrotate to work properly
 logfile_rotate 0
 
 #ZERO required for logrotate to work properly
 logfile_rotate 0