Make imagery servers listen on IPv6

diff --git a/cookbooks/imagery/templates/default/nginx_default.conf.erb b/cookbooks/imagery/templates/default/nginx_default.conf.erb
index 51670c71514eb2bdd996259980df7bbc62a7577b..cb629d59bda5f5e09d3ecbd2e7b81860aa575f5f 100644 (file)
--- 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 b038071b7861dbd4f8a840c18ec62f7ea8567025..afe33dfb98929424190eeae5915f0a58a490916e 100644 (file)
--- 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;