From f76186fc8a3ee4a7cd5f6ae9c4d0658ab0e63f85 Mon Sep 17 00:00:00 2001 From: Grant Slater Date: Tue, 14 Feb 2017 22:04:53 +0000 Subject: [PATCH] tilecache: enable 443 on ipv4 too --- cookbooks/imagery/templates/default/nginx_default.conf.erb | 3 ++- cookbooks/imagery/templates/default/nginx_imagery.conf.erb | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/cookbooks/imagery/templates/default/nginx_default.conf.erb b/cookbooks/imagery/templates/default/nginx_default.conf.erb index 93e3cf320..49ae05930 100644 --- a/cookbooks/imagery/templates/default/nginx_default.conf.erb +++ b/cookbooks/imagery/templates/default/nginx_default.conf.erb @@ -1,5 +1,6 @@ server { - listen [::]:80 ipv6only=off fastopen=1024 default_server; + listen [::]:80 ipv6only=on 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 7001f794c..86b66509d 100644 --- a/cookbooks/imagery/templates/default/nginx_imagery.conf.erb +++ b/cookbooks/imagery/templates/default/nginx_imagery.conf.erb @@ -1,6 +1,8 @@ server { - listen [::]:80; - listen [::]:443 ssl; + listen [::]:80 ipv6only=on; + listen *:80; + listen [::]:443 ipv6only=on 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; -- 2.43.2