From: Grant Slater Date: Wed, 3 Jul 2019 20:57:36 +0000 (+0100) Subject: Imagery: improved nginx listen + http2 X-Git-Url: https://git.openstreetmap.org./chef.git/commitdiff_plain/a87b5d01314ca96a7b26a219cfb0fb17c3e0bba5 Imagery: improved nginx listen + http2 --- diff --git a/cookbooks/imagery/templates/default/nginx_default.conf.erb b/cookbooks/imagery/templates/default/nginx_default.conf.erb index eeb4a61c1..4a74d06ed 100644 --- a/cookbooks/imagery/templates/default/nginx_default.conf.erb +++ b/cookbooks/imagery/templates/default/nginx_default.conf.erb @@ -1,8 +1,7 @@ server { - listen [::]:80 fastopen=2048 default_server; - listen *:80 fastopen=2048 default_server; - listen [::]:443 fastopen=2048 ssl http2; # No default_server here unless certificate specified here too. - listen *:443 fastopen=2048 ssl http2; # No default_server here unless certificate specified here too. + listen 80 deferred backlog=16384 reuseport fastopen=2048 http2 default_server;; + listen 443 ssl deferred backlog=16384 reuseport fastopen=2048 http2; # No default_server here unless certificate specified here too. + server_name _; default_type text/html; return 404 '404 Not Found

404 Not Found

default imagery server vhost. Please use correct URL.'; diff --git a/cookbooks/imagery/templates/default/nginx_imagery.conf.erb b/cookbooks/imagery/templates/default/nginx_imagery.conf.erb index 9aa397905..b95bc601f 100644 --- a/cookbooks/imagery/templates/default/nginx_imagery.conf.erb +++ b/cookbooks/imagery/templates/default/nginx_imagery.conf.erb @@ -1,6 +1,5 @@ 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; @@ -22,8 +21,7 @@ upstream <%= @name %>_fastcgi { } server { - listen [::]:443 ssl; - 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;