From 0a20e75aa3afc5a54a3b15b67023fbb6d05a5ffc Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Fri, 23 Jul 2021 11:18:14 +0100 Subject: [PATCH] Make imagery servers listen on IPv6 --- cookbooks/imagery/templates/default/nginx_default.conf.erb | 2 ++ cookbooks/imagery/templates/default/nginx_imagery.conf.erb | 2 ++ 2 files changed, 4 insertions(+) diff --git a/cookbooks/imagery/templates/default/nginx_default.conf.erb b/cookbooks/imagery/templates/default/nginx_default.conf.erb index 51670c715..cb629d59b 100644 --- a/cookbooks/imagery/templates/default/nginx_default.conf.erb +++ b/cookbooks/imagery/templates/default/nginx_default.conf.erb @@ -1,6 +1,8 @@ server { listen 80 deferred backlog=16384 reuseport default_server; listen 443 ssl deferred backlog=16384 reuseport http2; # No default_server here unless certificate specified here too. + listen [::]:80 deferred backlog=16384 reuseport default_server; + listen [::]:443 ssl deferred backlog=16384 reuseport http2; # No default_server here unless certificate specified here too. server_name _; default_type text/html; diff --git a/cookbooks/imagery/templates/default/nginx_imagery.conf.erb b/cookbooks/imagery/templates/default/nginx_imagery.conf.erb index b038071b7..afe33dfb9 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; @@ -22,6 +23,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; -- 2.39.5