]> 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: 9f4108f)
Make imagery servers listen on IPv6
authorTom Hughes <tom@compton.nu>
Sat, 28 Jan 2017 12:52:35 +0000 (12:52 +0000)
committerTom Hughes <tom@compton.nu>
Sat, 28 Jan 2017 12:52:35 +0000 (12:52 +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 4b57aafcc11b2e9556f3f57a68d5d26b1fbc843b..7c6ff48d7d12f40c43b86ca5fd07f0f1af766aea 100644 (file)
--- 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 '<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 a078c42a0f08341a71d111cc1a67235f4c6122cf..94b57076823770b976adde7d2078a4a14a09bec6 100644 (file)
--- 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 %>";
Chef configuration management public repo for configuring & maintaining the OpenStreetMap servers.