From d2f8a59b6540a6d8986f9643ea1fa878aaa1d0d9 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Tue, 15 Nov 2022 10:49:17 +0000
Subject: [PATCH] Updating proxy configuration for docker-compose, k8s and
 single image to allow longer timeout for app export requests. Also fixing an
 issue that blocked requests from getting to app-service.

---
 hosting/nginx.prod.conf.hbs                  | 13 +++++++++++--
 hosting/single/nginx/nginx-default-site.conf | 18 ++++++++++++++++++
 2 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/hosting/nginx.prod.conf.hbs b/hosting/nginx.prod.conf.hbs
index fe6f2529d3..64f6cbedd2 100644
--- a/hosting/nginx.prod.conf.hbs
+++ b/hosting/nginx.prod.conf.hbs
@@ -117,12 +117,21 @@ http {
     }
 
     location /api/backups/ {
+      # calls to export apps are limited
+      limit_req zone=ratelimit burst=20 nodelay;
+
+      # 1800s timeout for app export requests
       proxy_read_timeout 1800s;
       proxy_connect_timeout 1800s;
       proxy_send_timeout 1800s;
-      proxy_pass      http://app-service;
+
       proxy_http_version 1.1;
-      proxy_set_header Connection "";
+      proxy_set_header    Connection          $connection_upgrade;
+      proxy_set_header    Upgrade             $http_upgrade;
+      proxy_set_header    X-Real-IP           $remote_addr;
+      proxy_set_header    X-Forwarded-For     $proxy_add_x_forwarded_for;
+
+      proxy_pass      http://$apps:4002;
     }
 
     location /api/ {
diff --git a/hosting/single/nginx/nginx-default-site.conf b/hosting/single/nginx/nginx-default-site.conf
index bd89e21251..9a5ec91c1f 100644
--- a/hosting/single/nginx/nginx-default-site.conf
+++ b/hosting/single/nginx/nginx-default-site.conf
@@ -43,6 +43,24 @@ server {
         rewrite ^/worker/(.*)$ /$1 break;
     }
 
+    location /api/backups/ {
+        # calls to export apps are limited
+        limit_req zone=ratelimit burst=20 nodelay;
+
+        # 1800s timeout for app export requests
+        proxy_read_timeout 1800s;
+        proxy_connect_timeout 1800s;
+        proxy_send_timeout 1800s;
+
+        proxy_http_version 1.1;
+        proxy_set_header    Connection          $connection_upgrade;
+        proxy_set_header    Upgrade             $http_upgrade;
+        proxy_set_header    X-Real-IP           $remote_addr;
+        proxy_set_header    X-Forwarded-For     $proxy_add_x_forwarded_for;
+
+        proxy_pass      http://127.0.0.1:4001;
+    }
+
     location /api/ {
         # calls to the API are rate limited with bursting
         limit_req zone=ratelimit burst=20 nodelay;