X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/7426769ee7efed7e0559a58bb5e9bfd9f43d6c2a..d02429561da1d3ad2b5bbe0ac1108e8fc7774922:/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 5b3b91eb4..405949e24 100644 --- a/cookbooks/imagery/templates/default/nginx_imagery.conf.erb +++ b/cookbooks/imagery/templates/default/nginx_imagery.conf.erb @@ -1,8 +1,33 @@ server { - listen 80; - server_name <%= @name %>; + 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 -%>; - #FIXME WIP - #Needs to include or iterate through layers with rewrite + fastcgi - #Git checkout of web? + rewrite ^/\.well-known/acme-challenge/(.*)$ http://acme.openstreetmap.org/.well-known/acme-challenge/$1 permanent; + return 301 https://$host$request_uri; +} + +server { + 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; + ssl_certificate_key /etc/ssl/private/<%= @name %>.key; + + root "/srv/<%= @name %>"; + + gzip on; + gzip_types text/plain text/css application/json application/javascript application/x-javascript text/javascript text/xml application/xml application/rss+xml application/atom+xml application/rdf+xml image/svg+xml; # text/html is implicit + gzip_min_length 512; + gzip_http_version 1.0; + gzip_proxied any; + gzip_comp_level 9; + gzip_vary on; + + sendfile on; + tcp_nopush on; + + # Include site imagery layers + include /srv/imagery/nginx/<%= @name %>/layer-*.conf; }