X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/d02429561da1d3ad2b5bbe0ac1108e8fc7774922..b88e04237dcfbf1d7c4b7aa6023465f8e4a34f44:/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 405949e24..e1d33c7b6 100644 --- a/cookbooks/imagery/templates/default/nginx_imagery.conf.erb +++ b/cookbooks/imagery/templates/default/nginx_imagery.conf.erb @@ -1,19 +1,34 @@ server { + listen 80; 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; return 301 https://$host$request_uri; } +upstream <%= @name %>_fastcgi { + 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 +} + server { - listen [::]:443 ssl; - listen *:443 ssl; + 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; ssl_certificate_key /etc/ssl/private/<%= @name %>.key; +<% if node[:ssl][:strict_transport_security] -%> + + add_header Strict-Transport-Security "<%= node[:ssl][:strict_transport_security] %>" always; +<% end -%> + + # Requests sent within early data are subject to replay attacks. + # See: http://nginx.org/en/docs/http/ngx_http_ssl_module.html#ssl_early_data + ssl_early_data on; root "/srv/<%= @name %>"; @@ -25,9 +40,6 @@ server { gzip_comp_level 9; gzip_vary on; - sendfile on; - tcp_nopush on; - # Include site imagery layers include /srv/imagery/nginx/<%= @name %>/layer-*.conf; }