From efec9044e973a2ae2a7b48d169b55e250c469ede Mon Sep 17 00:00:00 2001 From: Grant Slater Date: Sat, 4 Jan 2020 16:41:10 +0000 Subject: [PATCH] tilecache: enable IPv6 --- cookbooks/nginx/recipes/default.rb | 2 +- cookbooks/squid/recipes/default.rb | 2 +- cookbooks/tilecache/templates/default/nginx_tile.conf.erb | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cookbooks/nginx/recipes/default.rb b/cookbooks/nginx/recipes/default.rb index 480937407..93aab5690 100644 --- 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 - subscribes :restart, "template[/etc/nginx/nginx.conf]", :immediately + subscribes :restart, "template[/etc/nginx/nginx.conf]" end munin_plugin_conf "nginx" do diff --git a/cookbooks/squid/recipes/default.rb b/cookbooks/squid/recipes/default.rb index 52ed003ca..fcc5f337c 100644 --- 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]" - subscribes :restart, "template[/etc/squid/squid.conf]", :immediately + subscribes :restart, "template[/etc/squid/squid.conf]" subscribes :reload, "template[/etc/resolv.conf]" end diff --git a/cookbooks/tilecache/templates/default/nginx_tile.conf.erb b/cookbooks/tilecache/templates/default/nginx_tile.conf.erb index d298fe98e..0fac382a2 100644 --- a/cookbooks/tilecache/templates/default/nginx_tile.conf.erb +++ b/cookbooks/tilecache/templates/default/nginx_tile.conf.erb @@ -94,8 +94,8 @@ server { listen 80 deferred backlog=16384 reuseport fastopen=2048 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; + 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; -- 2.43.2