From b3ba55c1c0ca4d5009ecba5fd43a66399214b425 Mon Sep 17 00:00:00 2001
From: pablohashescobar <nikhilschacko@gmail.com>
Date: Thu, 16 May 2024 16:05:54 +0530
Subject: [PATCH] dev:  nginx configuration

---
 nginx/nginx.conf.dev      | 31 ++++++++++++++++++------
 nginx/nginx.conf.template | 51 +++++++++++++++++++++++++++------------
 2 files changed, 60 insertions(+), 22 deletions(-)

diff --git a/nginx/nginx.conf.dev b/nginx/nginx.conf.dev
index 869c2e807..a6f20cbf5 100644
--- a/nginx/nginx.conf.dev
+++ b/nginx/nginx.conf.dev
@@ -18,37 +18,54 @@ http {
         add_header X-Forwarded-Proto         "${dollar}scheme";
         add_header X-Forwarded-Host          "${dollar}host";
         add_header X-Forwarded-For           "${dollar}proxy_add_x_forwarded_for";
-        add_header Host                      "${dollar}http_host";
+        add_header X-Real-IP                 "${dollar}remote_addr";
 
         location / {
-            proxy_pass http://web:3000/;
             proxy_http_version 1.1;
             proxy_set_header Upgrade ${dollar}http_upgrade;
             proxy_set_header Connection "upgrade";
+            proxy_set_header Host ${dollar}http_host;
+            proxy_pass http://web:3000/;
         }
 
         location /god-mode/ {
+            proxy_http_version 1.1;
+            proxy_set_header Upgrade ${dollar}http_upgrade;
+            proxy_set_header Connection "upgrade";
+            proxy_set_header Host ${dollar}http_host;
             proxy_pass http://admin:3001/god-mode/;
         }
 
         location /api/ {
-            proxy_set_header X-Forwarded-For "${dollar}proxy_add_x_forwarded_for";
-            proxy_set_header Host            "${dollar}http_host";
+            proxy_http_version 1.1;
+            proxy_set_header Upgrade ${dollar}http_upgrade;
+            proxy_set_header Connection "upgrade";
+            proxy_set_header Host ${dollar}http_host;
             proxy_pass http://api:8000/api/;
         }
 
         location /auth/ {
-            proxy_set_header X-Forwarded-For "${dollar}proxy_add_x_forwarded_for";
-            proxy_set_header Host            "${dollar}http_host";
+            proxy_http_version 1.1;
+            proxy_set_header Upgrade ${dollar}http_upgrade;
+            proxy_set_header Connection "upgrade";
+            proxy_set_header Host ${dollar}http_host;
             proxy_pass http://api:8000/auth/;
         }
 
         location /spaces/ {
-            rewrite ^/spaces/?$ /spaces/login break;
+            rewrite ^/spaces/?$ /spaces/login break;            
+            proxy_http_version 1.1;
+            proxy_set_header Upgrade ${dollar}http_upgrade;
+            proxy_set_header Connection "upgrade";
+            proxy_set_header Host ${dollar}http_host;
             proxy_pass http://space:3002/spaces/;
         }
 
         location /${BUCKET_NAME}/ {
+            proxy_http_version 1.1;
+            proxy_set_header Upgrade ${dollar}http_upgrade;
+            proxy_set_header Connection "upgrade";
+            proxy_set_header Host ${dollar}http_host;
             proxy_pass http://plane-minio:9000/uploads/;
         }
     }
diff --git a/nginx/nginx.conf.template b/nginx/nginx.conf.template
index a03e8ee5f..56fdae8dc 100644
--- a/nginx/nginx.conf.template
+++ b/nginx/nginx.conf.template
@@ -18,34 +18,55 @@ http {
         add_header X-Forwarded-Proto         "${dollar}scheme";
         add_header X-Forwarded-Host          "${dollar}host";
         add_header X-Forwarded-For           "${dollar}proxy_add_x_forwarded_for";
-        add_header Host                      "${dollar}http_host";
+        add_header X-Real-IP                 "${dollar}remote_addr";
 
         location / {
+            proxy_http_version 1.1;
+            proxy_set_header Upgrade ${dollar}http_upgrade;
+            proxy_set_header Connection "upgrade";
+            proxy_set_header Host ${dollar}http_host;
             proxy_pass http://web:3000/;
         }
 
-        location /api/ {
-            proxy_set_header X-Forwarded-For "${dollar}proxy_add_x_forwarded_for";
-            proxy_set_header Host            "${dollar}http_host";
-            proxy_pass http://api:8000/api/;
-        }
-
-        location /spaces/ {
-            proxy_pass http://space:3000/spaces/;
-        }
-        
         location /god-mode/ {
+            proxy_http_version 1.1;
+            proxy_set_header Upgrade ${dollar}http_upgrade;
+            proxy_set_header Connection "upgrade";
+            proxy_set_header Host ${dollar}http_host;
             proxy_pass http://admin:3000/god-mode/;
         }
 
+        location /api/ {
+            proxy_http_version 1.1;
+            proxy_set_header Upgrade ${dollar}http_upgrade;
+            proxy_set_header Connection "upgrade";
+            proxy_set_header Host ${dollar}http_host;
+            proxy_pass http://api:8000/api/;
+        }
+
         location /auth/ {
-            proxy_set_header X-Forwarded-For "${dollar}proxy_add_x_forwarded_for";
-            proxy_set_header Host            "${dollar}http_host";
+            proxy_http_version 1.1;
+            proxy_set_header Upgrade ${dollar}http_upgrade;
+            proxy_set_header Connection "upgrade";
+            proxy_set_header Host ${dollar}http_host;
             proxy_pass http://api:8000/auth/;
         }
 
+        location /spaces/ {
+            rewrite ^/spaces/?$ /spaces/login break;            
+            proxy_http_version 1.1;
+            proxy_set_header Upgrade ${dollar}http_upgrade;
+            proxy_set_header Connection "upgrade";
+            proxy_set_header Host ${dollar}http_host;
+            proxy_pass http://space:3000/spaces/;
+        }
+
         location /${BUCKET_NAME}/ {
-            proxy_pass http://plane-minio:9000/${BUCKET_NAME}/;
+            proxy_http_version 1.1;
+            proxy_set_header Upgrade ${dollar}http_upgrade;
+            proxy_set_header Connection "upgrade";
+            proxy_set_header Host ${dollar}http_host;
+            proxy_pass http://plane-minio:9000/uploads/;
         }
     }
-}
\ No newline at end of file
+}