X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/0a20e75aa3afc5a54a3b15b67023fbb6d05a5ffc..44166d054d076ce26743c466ce002d7bc2e3c4dd:/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 afe33dfb9..03a439343 100644 --- a/cookbooks/imagery/templates/default/nginx_imagery.conf.erb +++ b/cookbooks/imagery/templates/default/nginx_imagery.conf.erb @@ -7,25 +7,29 @@ server { return 301 https://$host$request_uri; } +<% if @uses_tiler -%> +upstream <%= @name %>_tiler_backend { + 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 %>-0.socket" max_fails=0; - server "unix:/var/run/mapserver-fastcgi/layer-<%= @name %>-1.socket" max_fails=0; - server "unix:/var/run/mapserver-fastcgi/layer-<%= @name %>-2.socket" max_fails=0; - server "unix:/var/run/mapserver-fastcgi/layer-<%= @name %>-3.socket" max_fails=0; - server "unix:/var/run/mapserver-fastcgi/layer-<%= @name %>-4.socket" max_fails=0; - server "unix:/var/run/mapserver-fastcgi/layer-<%= @name %>-5.socket" max_fails=0; - server "unix:/var/run/mapserver-fastcgi/layer-<%= @name %>-6.socket" max_fails=0; - server "unix:/var/run/mapserver-fastcgi/layer-<%= @name %>-7.socket" max_fails=0; + 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 } +<% end -%> server { listen 443 ssl http2; listen [::]:443 ssl http2; 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; + keepalive_timeout 30s; + ssl_certificate /etc/ssl/certs/<%= @name %>.pem; ssl_certificate_key /etc/ssl/private/<%= @name %>.key; <% if node[:ssl][:strict_transport_security] -%>