Merge remote-tracking branch 'github/pull/740'

[chef.git] / cookbooks / imagery / templates / default / nginx_imagery.conf.erb

diff --git a/cookbooks/imagery/templates/default/nginx_imagery.conf.erb b/cookbooks/imagery/templates/default/nginx_imagery.conf.erb
index ea9730a95d2ba3c90012b78c1b6f0f3c8e230bd5..a232d783011c88dba3dfb77ebaa01f427d70f79b 100644 (file)
--- a/cookbooks/imagery/templates/default/nginx_imagery.conf.erb
+++ b/cookbooks/imagery/templates/default/nginx_imagery.conf.erb
@@ -9,13 +9,13 @@ server {
 
 <% if @uses_tiler -%>
 upstream <%= @name %>_tiler_backend {
 
 <% if @uses_tiler -%>
 upstream <%= @name %>_tiler_backend {

-    server 127.0.0.1:8080 max_fails=0;
-
-    keepalive 32;
+    server unix:/srv/imagery/sockets/titiler.sock max_fails=0;
+    server unix:/srv/./imagery/sockets/titiler.sock max_fails=0;

 }
 <% else -%>
 upstream <%= @name %>_fastcgi {
     server "unix:/var/run/mapserver-fastcgi/layer-<%= @name %>.socket" max_fails=0;
 }
 <% else -%>
 upstream <%= @name %>_fastcgi {
     server "unix:/var/run/mapserver-fastcgi/layer-<%= @name %>.socket" max_fails=0;

+    server "unix:/var/run/./mapserver-fastcgi/layer-<%= @name %>.socket" max_fails=0;

 
     # Use default round-robin to distribute requests, rather than pick "fast" but maybe faulty.
     # Do not use keepalive
 
     # Use default round-robin to distribute requests, rather than pick "fast" but maybe faulty.
     # Do not use keepalive


@@ -23,8 +23,11 @@ upstream <%= @name %>_fastcgi {
 <% end -%>
 
 server {
 <% end -%>
 
 server {

-    listen 443 ssl http2;
-    listen [::]:443 ssl http2;
+    listen 443 ssl;
+    listen [::]:443 ssl;
+
+    http2 on;
+

     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 -%>;
 
     http2_max_concurrent_streams 512;
     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 -%>;
 
     http2_max_concurrent_streams 512;