imagery: fix nginx listen

diff --git a/cookbooks/imagery/templates/default/nginx_default.conf.erb b/cookbooks/imagery/templates/default/nginx_default.conf.erb
index 49ae05930dd988a58287b907ab60c2dd151e374d..4e003a15700e2900f66ea79c23816ec9abb20632 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 {
 server {

-    listen [::]:80 ipv6only=on fastopen=1024 default_server;
+    listen [::]:80 fastopen=1024 default_server;

     listen *:80 fastopen=1024 default_server;
     server_name  _;
     default_type text/html;
     listen *:80 fastopen=1024 default_server;
     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 86b66509df8c156010d6749d5f7c2e0b94d239c3..5c740cdc966df395ebba5024194a566de6c2efb4 100644 (file)
--- a/cookbooks/imagery/templates/default/nginx_imagery.conf.erb
+++ b/cookbooks/imagery/templates/default/nginx_imagery.conf.erb
@@ -1,7 +1,7 @@
 server {
 server {

-    listen [::]:80 ipv6only=on;
+    listen [::]:80;

     listen *:80;
     listen *:80;

-    listen [::]:443 ipv6only=on ssl;
+    listen [::]:443 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 -%>;
 
     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 -%>;