X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/ab47927c016597f8602b81dcdc168ad5c335389d..b9c0d9f47a55952cdb03690a9d1b865dd072c588:/cookbooks/imagery/templates/default/nginx_imagery.conf.erb?ds=sidebyside diff --git a/cookbooks/imagery/templates/default/nginx_imagery.conf.erb b/cookbooks/imagery/templates/default/nginx_imagery.conf.erb index b038071b7..e1d33c7b6 100644 --- a/cookbooks/imagery/templates/default/nginx_imagery.conf.erb +++ b/cookbooks/imagery/templates/default/nginx_imagery.conf.erb @@ -1,5 +1,6 @@ server { listen 80; + listen [::]:80; server_name <%= @name %> a.<%= @name %> b.<%= @name %> c.<%= @name %><% @aliases.each do |alias_name| %> <%= alias_name %> a.<%= alias_name %> b.<%= alias_name %> c.<%= alias_name %><%- end -%>; rewrite ^/\.well-known/acme-challenge/(.*)$ http://acme.openstreetmap.org/.well-known/acme-challenge/$1 permanent; @@ -7,14 +8,7 @@ server { } upstream <%= @name %>_fastcgi { - server "unix:/var/run/mapserver-fastcgi/layer-<%= @name %>-0.socket" max_fails=0; - server "unix:/var/run/mapserver-fastcgi/layer-<%= @name %>-1.socket" max_fails=0; - server "unix:/var/run/mapserver-fastcgi/layer-<%= @name %>-2.socket" max_fails=0; - server "unix:/var/run/mapserver-fastcgi/layer-<%= @name %>-3.socket" max_fails=0; - server "unix:/var/run/mapserver-fastcgi/layer-<%= @name %>-4.socket" max_fails=0; - server "unix:/var/run/mapserver-fastcgi/layer-<%= @name %>-5.socket" max_fails=0; - server "unix:/var/run/mapserver-fastcgi/layer-<%= @name %>-6.socket" max_fails=0; - server "unix:/var/run/mapserver-fastcgi/layer-<%= @name %>-7.socket" max_fails=0; + server "unix:/var/run/mapserver-fastcgi/layer-<%= @name %>.socket" max_fails=0; # Use default round-robin to distribute requests, rather than pick "fast" but maybe faulty. # Do not use keepalive @@ -22,6 +16,7 @@ upstream <%= @name %>_fastcgi { server { listen 443 ssl http2; + listen [::]:443 ssl http2; server_name <%= @name %> a.<%= @name %> b.<%= @name %> c.<%= @name %><% @aliases.each do |alias_name| %> <%= alias_name %> a.<%= alias_name %> b.<%= alias_name %> c.<%= alias_name %><%- end -%>; ssl_certificate /etc/ssl/certs/<%= @name %>.pem;