From: Grant Slater <git@firefishy.com>
Date: Fri, 21 Dec 2018 13:45:14 +0000 (+0000)
Subject: imagery: use nginx upstream round-robin instead of least_conn
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/c78b8fa365d88af4279acabf0f340550c09e5e03

imagery: use nginx upstream round-robin instead of least_conn
---

diff --git a/cookbooks/imagery/templates/default/nginx_imagery.conf.erb b/cookbooks/imagery/templates/default/nginx_imagery.conf.erb
index e5d3dac56..9aa397905 100644
--- a/cookbooks/imagery/templates/default/nginx_imagery.conf.erb
+++ b/cookbooks/imagery/templates/default/nginx_imagery.conf.erb
@@ -16,7 +16,9 @@ upstream <%= @name %>_fastcgi {
     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;
-    least_conn;
+
+    # Use default round-robin to distribute requests, rather than pick "fast" but maybe faulty.
+    # Do not use keepalive
 }
 
 server {