X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/6adfd52016f87f9622a750cea3e2e926e1f09d61..44f97b9d96e014717d83f2fcf43e0a95fe82ba61:/cookbooks/imagery/templates/default/nginx_imagery.conf.erb diff --git a/cookbooks/imagery/templates/default/nginx_imagery.conf.erb b/cookbooks/imagery/templates/default/nginx_imagery.conf.erb index b926d479c..5c740cdc9 100644 --- a/cookbooks/imagery/templates/default/nginx_imagery.conf.erb +++ b/cookbooks/imagery/templates/default/nginx_imagery.conf.erb @@ -1,6 +1,8 @@ server { listen [::]:80; + listen *:80; listen [::]:443 ssl; + listen *:443 ssl; 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; @@ -13,6 +15,8 @@ server { ssl_session_timeout 30m; ssl_stapling on; ssl_dhparam /etc/ssl/certs/dhparam.pem; + resolver <%= @resolvers.join(" ") %>; + resolver_timeout 5s; root "/srv/<%= @name %>"; rewrite ^/\.well-known/acme-challenge/(.*)$ http://acme.openstreetmap.org/.well-known/acme-challenge/$1 permanent;