Replace cgiirc with a form frontend for webchat.oftc.net

[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 22b94ddec829140a56e08dbe4684b13ac2d53544..940eaae3f82dc85da8c269d7bdccabb818768253 100644 (file)
--- a/cookbooks/squid/templates/default/squid.conf.erb
+++ b/cookbooks/squid/templates/default/squid.conf.erb
@@ -9,6 +9,9 @@ cache_mem  <%= node[:squid][:cache_mem] %>
 workers <%= [ node[:cpu][:total] - 2, 1 ].max.ceil %>
 cpu_affinity_map process_numbers=<%= (1..[ node[:cpu][:total] - 2, 1 ].max.ceil).to_a.join(',') %> cores=<%=(1..[ node[:cpu][:total] - 2, 1 ].max.ceil).to_a.join(',') %>
 
+# Set short clean shutdown interval
+shutdown_lifetime 10 seconds
+
 error_log_languages off
 <% end -%>
 
@@ -34,7 +37,8 @@ log_icp_queries off
 <% 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 no-vhost defaultsite=tile.openstreetmap.org tcpkeepalive=60,10,6
+http_port 8080 accel no-vhost defaultsite=tile.openstreetmap.org tcpkeepalive=60,10,6
 <% end -%>
 
 cache_effective_user proxy