tilecache: switch port 80 traffic to nginx

diff --git a/cookbooks/nginx/recipes/default.rb b/cookbooks/nginx/recipes/default.rb
index 93aab56906afd96dabce0acc328ffbc0a3ff5a62..480937407b3c5421e93e6ca4e4ec5eb7a5044649 100644 (file)
--- a/cookbooks/nginx/recipes/default.rb
+++ b/cookbooks/nginx/recipes/default.rb
@@ -50,7 +50,7 @@ end
 service "nginx" do
   action [:enable] # Do not start the service as config may be broken from failed chef run
   supports :status => true, :restart => true, :reload => true
 service "nginx" do
   action [:enable] # Do not start the service as config may be broken from failed chef run
   supports :status => true, :restart => true, :reload => true

-  subscribes :restart, "template[/etc/nginx/nginx.conf]"
+  subscribes :restart, "template[/etc/nginx/nginx.conf]", :immediately

 end
 
 munin_plugin_conf "nginx" do
 end
 
 munin_plugin_conf "nginx" do

diff --git a/cookbooks/squid/recipes/default.rb b/cookbooks/squid/recipes/default.rb
index fcc5f337c6c07cce8816abab687a599ecab4837d..52ed003cada57fd8ef5a2ddee29f57cdc7a7218b 100644 (file)
--- a/cookbooks/squid/recipes/default.rb
+++ b/cookbooks/squid/recipes/default.rb
@@ -108,7 +108,7 @@ end
 service "squid" do
   action [:enable, :start]
   subscribes :restart, "systemd_service[squid]"
 service "squid" do
   action [:enable, :start]
   subscribes :restart, "systemd_service[squid]"

-  subscribes :restart, "template[/etc/squid/squid.conf]"
+  subscribes :restart, "template[/etc/squid/squid.conf]", :immediately

   subscribes :reload, "template[/etc/resolv.conf]"
 end
 
   subscribes :reload, "template[/etc/resolv.conf]"
 end
 

diff --git a/cookbooks/squid/templates/default/squid.conf.erb b/cookbooks/squid/templates/default/squid.conf.erb
index ede39efab42787720acd48d03c18886c8dfae4e3..940eaae3f82dc85da8c269d7bdccabb818768253 100644 (file)
--- a/cookbooks/squid/templates/default/squid.conf.erb
+++ b/cookbooks/squid/templates/default/squid.conf.erb
@@ -37,7 +37,7 @@ log_icp_queries off
 <% if node[:squid][:version] < 3 -%>
 http_port 80 accel defaultsite=tile.openstreetmap.org tcpkeepalive=60,10,6 http11
 <% else -%>
 <% 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 -%>
 
 http_port 8080 accel no-vhost defaultsite=tile.openstreetmap.org tcpkeepalive=60,10,6
 <% end -%>
 

diff --git a/cookbooks/tilecache/templates/default/nginx_tile.conf.erb b/cookbooks/tilecache/templates/default/nginx_tile.conf.erb
index 6895ea54cccf57528290f283036f7ffd3b06facb..d298fe98e0b4efa0e3e6094c0d03595bd8e5d1a3 100644 (file)
--- a/cookbooks/tilecache/templates/default/nginx_tile.conf.erb
+++ b/cookbooks/tilecache/templates/default/nginx_tile.conf.erb
@@ -90,7 +90,12 @@ map $osm_referer$http_user_agent $limit_http_pragma {
 }
 
 server {
 }
 
 server {

+    # IPv4
+    listen       80 deferred backlog=16384 reuseport fastopen=2048 default_server;

     listen       443 ssl deferred backlog=16384 reuseport fastopen=2048 http2 default_server;
     listen       443 ssl deferred backlog=16384 reuseport fastopen=2048 http2 default_server;

+    # IPv6
+    # listen       [::]:80 deferred backlog=16384 reuseport fastopen=2048 default_server;
+    # listen       [::]:443 ssl deferred backlog=16384 reuseport fastopen=2048 http2 default_server;

     server_name  localhost;
 
     proxy_buffers 8 64k;
     server_name  localhost;
 
     proxy_buffers 8 64k;