From: Brett Smith <brett@curoverse.com>
Date: Sat, 1 Aug 2015 19:05:23 +0000 (-0400)
Subject: 6591: Suggest proxy timeouts in install doc Nginx configs.
X-Git-Tag: 1.1.0~1444^2~2
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/a812a13a6e9854f37ecebccedeb163b8cbe7130e

6591: Suggest proxy timeouts in install doc Nginx configs.

These settings match what we use in production.  The defaults are more
aggressive and can cause 503 responses for larger requests.
---

diff --git a/doc/install/install-api-server.html.textile.liquid b/doc/install/install-api-server.html.textile.liquid
index 2fbea090c0..8625e7f54e 100644
--- a/doc/install/install-api-server.html.textile.liquid
+++ b/doc/install/install-api-server.html.textile.liquid
@@ -283,6 +283,8 @@ server {
   location / {
     proxy_pass            http://api;
     proxy_redirect        off;
+    proxy_connect_timeout 90s;
+    proxy_read_timeout    300s;
 
     proxy_set_header      X-Forwarded-Proto https;
     proxy_set_header      Host $http_host;
@@ -303,6 +305,8 @@ server {
   location / {
     proxy_pass            http://websockets;
     proxy_redirect        off;
+    proxy_connect_timeout 90s;
+    proxy_read_timeout    300s;
 
     proxy_set_header      Upgrade $http_upgrade;
     proxy_set_header      Connection "upgrade";
diff --git a/doc/install/install-workbench-app.html.textile.liquid b/doc/install/install-workbench-app.html.textile.liquid
index 6e91178ad0..e4cc8a5ea7 100644
--- a/doc/install/install-workbench-app.html.textile.liquid
+++ b/doc/install/install-workbench-app.html.textile.liquid
@@ -145,6 +145,8 @@ server {
   location / {
     proxy_pass            http://workbench;
     proxy_redirect        off;
+    proxy_connect_timeout 90s;
+    proxy_read_timeout    300s;
 
     proxy_set_header      X-Forwarded-Proto https;
     proxy_set_header      Host $http_host;