From 0ecdb6e3c330b9594a83443ea60597f8367c55bf Mon Sep 17 00:00:00 2001
From: Tagada <36127788+Tagadda@users.noreply.github.com>
Date: Mon, 18 May 2020 15:23:13 +0200
Subject: Fix nginx.conf for multi-instance

---
 conf/nginx.conf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'conf/nginx.conf')

diff --git a/conf/nginx.conf b/conf/nginx.conf
index 7fa7b87..d348613 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -38,7 +38,7 @@ location @proxy {
   proxy_set_header Proxy "";
   proxy_pass_header Server;
 
-  proxy_pass http://127.0.0.1:3000;
+  proxy_pass http://127.0.0.1:__PORT_WEB__;
   proxy_buffering on;
   proxy_redirect off;
   proxy_http_version 1.1;
@@ -62,7 +62,7 @@ location /api/v1/streaming {
   proxy_set_header X-Forwarded-Proto https;
   proxy_set_header Proxy "";
 
-  proxy_pass http://127.0.0.1:4000;
+  proxy_pass http://127.0.0.1:__PORT_STREAM__;
   proxy_buffering off;
   proxy_redirect off;
   proxy_http_version 1.1;
-- 
cgit v1.2.3-70-g09d2


From 1f9dc463f214a8692e99ca1f3273461dda55e8fd Mon Sep 17 00:00:00 2001
From: yalh76 <yalh@yahoo.com>
Date: Tue, 26 May 2020 14:39:04 +0200
Subject: switching from add_header to more_set_headers

---
 conf/nginx.conf | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'conf/nginx.conf')

diff --git a/conf/nginx.conf b/conf/nginx.conf
index d348613..866fcc7 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -19,14 +19,14 @@ location / {
 }
 
 location ~ ^/(emoji|packs|system/accounts/avatars|system/media_attachments/files) {
-  add_header Cache-Control "public, max-age=31536000, immutable";
-  add_header Strict-Transport-Security "max-age=31536000";
+  more_set_headers "Cache-Control: public, max-age=31536000, immutable";
+  more_set_headers "Strict-Transport-Security: max-age=31536000";
   try_files $uri @proxy;
 }
 
 location /sw.js {
-  add_header Cache-Control "public, max-age=0";
-  add_header Strict-Transport-Security "max-age=31536000";
+  more_set_headers "Cache-Control: public, max-age=0";
+  more_set_headers "Strict-Transport-Security: max-age=31536000";
   try_files $uri @proxy;
 }
 
@@ -49,8 +49,8 @@ location @proxy {
   proxy_cache_valid 200 7d;
   proxy_cache_valid 410 24h;
   proxy_cache_use_stale error timeout updating http_500 http_502 http_503 http_504;
-  add_header X-Cached $upstream_cache_status;
-  add_header Strict-Transport-Security "max-age=31536000";
+  more_set_headers "X-Cached: $upstream_cache_status";
+  more_set_headers "Strict-Transport-Security: max-age=31536000";
 
   tcp_nodelay on;
 }
-- 
cgit v1.2.3-70-g09d2