From: Tom Hughes Date: Sat, 28 Jan 2017 12:52:35 +0000 (+0000) Subject: Make imagery servers listen on IPv6 X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/2c43a39d8b64cbc09f4c5a56f519bbf5462ca9c6?hp=9f4108f00bbf23094f1607566dba2dccda5df314 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 4b57aafcc..7c6ff48d7 100644 --- a/cookbooks/imagery/templates/default/nginx_default.conf.erb +++ b/cookbooks/imagery/templates/default/nginx_default.conf.erb @@ -1,5 +1,5 @@ server { - listen 80 fastopen=1024 default_server; + listen [::]:80 fastopen=1024 default_server; 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 a078c42a0..94b570768 100644 --- a/cookbooks/imagery/templates/default/nginx_imagery.conf.erb +++ b/cookbooks/imagery/templates/default/nginx_imagery.conf.erb @@ -1,5 +1,5 @@ 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 -%>; root "/srv/<%= @name %>";