From 29209454cb618b9d0c9a53a3ec539f3e548f5021 Mon Sep 17 00:00:00 2001
From: Fabien BOURGEOIS <fabien@yaltik.com>
Date: Wed, 24 Apr 2019 04:49:55 +0200
Subject: [PATCH] [IMP]Odoo Nginx : make proxy timeouts configurable

---
 odoo/nginx/launch.sh     | 5 ++++-
 odoo/nginx/odoo.conf     | 6 +++---
 odoo/nginx/odoo.conf.dev | 7 ++++---
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/odoo/nginx/launch.sh b/odoo/nginx/launch.sh
index b0ad688..fb4f261 100644
--- a/odoo/nginx/launch.sh
+++ b/odoo/nginx/launch.sh
@@ -15,7 +15,10 @@ for tpl in * ; do
     do
       SERVICE=${ODOO_SERVICE[$index]}
       SERVER_NAMES=${ODOO_SERVER_NAMES[$index]}
-      export SERVICE SERVER_NAMES
+      PROXY_READ_TIMEOUT=${PROXY_READ_TIMEOUT:=720s}
+      PROXY_CONNECT_TIMEOUT=${PROXY_CONNECT_TIMEOUT:=720s}
+      PROXY_SEND_TIMEOUT=${PROXY_SEND_TIMEOUT:=720s}
+      export SERVICE SERVER_NAMES PROXY_READ_TIMEOUT PROXY_CONNECT_TIMEOUT PROXY_SEND_TIMEOUT
       envsubst < $tpl >> /etc/nginx/conf.d/$tpl
       ((index++))
     done
diff --git a/odoo/nginx/odoo.conf b/odoo/nginx/odoo.conf
index 65da39a..8297cd1 100644
--- a/odoo/nginx/odoo.conf
+++ b/odoo/nginx/odoo.conf
@@ -22,9 +22,9 @@ server {
         gzip_types text/plain text/xml text/css text/less application/x-javascript application/xml application/json application/javascript;
         gzip_vary on;
         keepalive_timeout 120s;
-        proxy_read_timeout 720s;
-        proxy_connect_timeout 720s;
-        proxy_send_timeout 720s;
+        proxy_read_timeout ${PROXY_READ_TIMEOUT};
+        proxy_connect_timeout ${PROXY_CONNECT_TIMEOUT};
+        proxy_send_timeout ${PROXY_SEND_TIMEOUT};
         proxy_buffer_size 64k;
         proxy_buffering off;
         proxy_buffers 4 64k;
diff --git a/odoo/nginx/odoo.conf.dev b/odoo/nginx/odoo.conf.dev
index eef89f8..32297a2 100644
--- a/odoo/nginx/odoo.conf.dev
+++ b/odoo/nginx/odoo.conf.dev
@@ -10,9 +10,10 @@ server {
  	listen ${PORT};
  	server_name ${SERVER_NAMES};
         client_max_body_size 200M;
-        proxy_read_timeout 720s;
-        proxy_connect_timeout 720s;
-        proxy_send_timeout 720s;
+        keepalive_timeout 120s;
+        proxy_read_timeout ${PROXY_READ_TIMEOUT};
+        proxy_connect_timeout ${PROXY_CONNECT_TIMEOUT};
+        proxy_send_timeout ${PROXY_SEND_TIMEOUT};
         proxy_set_header Host ${DOLLSIGN}http_host;
         proxy_set_header X-Forwarded-Host ${DOLLSIGN}http_host;
         proxy_set_header X-Forwarded-For ${DOLLSIGN}proxy_add_x_forwarded_for;