]> git.openstreetmap.org Git - chef.git/commitdiff
projects / chef.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 0402846)
tilecache: enable 443 on ipv4 too
authorGrant Slater <git@firefishy.com>
Tue, 14 Feb 2017 22:04:53 +0000 (22:04 +0000)
committerGrant Slater <git@firefishy.com>
Tue, 14 Feb 2017 22:04:53 +0000 (22:04 +0000)
cookbooks/imagery/templates/default/nginx_default.conf.erb patch | blob | history
cookbooks/imagery/templates/default/nginx_imagery.conf.erb patch | blob | history

diff --git a/cookbooks/imagery/templates/default/nginx_default.conf.erb b/cookbooks/imagery/templates/default/nginx_default.conf.erb
index 93e3cf320e15ad086f5e0ce4c6d59deba6f0a3e8..49ae05930dd988a58287b907ab60c2dd151e374d 100644 (file)
--- a/cookbooks/imagery/templates/default/nginx_default.conf.erb
+++ b/cookbooks/imagery/templates/default/nginx_default.conf.erb
@@ -1,5 +1,6 @@
 server {
 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 '<html><head><title>404 Not Found</title></head><body bgcolor="white"><center><h1>404 Not Found</h1></center><hr><center>default imagery server vhost. Please use correct URL.</center></body></html>';
     server_name  _;
     default_type text/html;
     return 404 '<html><head><title>404 Not Found</title></head><body bgcolor="white"><center><h1>404 Not Found</h1></center><hr><center>default imagery server vhost. Please use correct URL.</center></body></html>';
diff --git a/cookbooks/imagery/templates/default/nginx_imagery.conf.erb b/cookbooks/imagery/templates/default/nginx_imagery.conf.erb
index 7001f794cf325665ceac874b85e5013dad4756ee..86b66509df8c156010d6749d5f7c2e0b94d239c3 100644 (file)
--- a/cookbooks/imagery/templates/default/nginx_imagery.conf.erb
+++ b/cookbooks/imagery/templates/default/nginx_imagery.conf.erb
@@ -1,6 +1,8 @@
 server {
 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;
     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;
Chef configuration management public repo for configuring & maintaining the OpenStreetMap servers.