From ba4c0076fdb8a2b5aab7b67ad3143c95e552a006 Mon Sep 17 00:00:00 2001
From: Sam Al-Sapti <sam@sapti.me>
Date: Wed, 19 Feb 2025 00:40:53 +0100
Subject: [PATCH] Fix NGINX for NodeBB

---
 .../templates/compose-files/fedi_dk_nodebb.yml.j2      |  2 --
 .../docker/templates/fedi_dk_nodebb/nginx/http.conf.j2 | 10 ++++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/roles/docker/templates/compose-files/fedi_dk_nodebb.yml.j2 b/roles/docker/templates/compose-files/fedi_dk_nodebb.yml.j2
index 7d98116..c501d90 100644
--- a/roles/docker/templates/compose-files/fedi_dk_nodebb.yml.j2
+++ b/roles/docker/templates/compose-files/fedi_dk_nodebb.yml.j2
@@ -8,7 +8,6 @@ services:
     volumes:
       - "./nginx:/etc/nginx/conf.d:ro"
       - "./build:/usr/src/app/build:ro"
-      - "./public:/usr/src/app/public:ro"
     environment:
       VIRTUAL_HOST: {{ services.fedi_dk_nodebb.domain }}
       VIRTUAL_PORT: 80
@@ -54,7 +53,6 @@ services:
       postfix:
     volumes:
       - "./build:/usr/src/app/build:rw"
-      - "./public:/usr/src/app/public:rw"
       - "./uploads:/usr/src/app/public/uploads:rw"
       - "./config:/opt/config:rw"
       - "./setup.json:/usr/src/app/setup.json:ro"
diff --git a/roles/docker/templates/fedi_dk_nodebb/nginx/http.conf.j2 b/roles/docker/templates/fedi_dk_nodebb/nginx/http.conf.j2
index f741fb1..e2647e9 100644
--- a/roles/docker/templates/fedi_dk_nodebb/nginx/http.conf.j2
+++ b/roles/docker/templates/fedi_dk_nodebb/nginx/http.conf.j2
@@ -10,8 +10,10 @@ upstream workers {
 }
 
 server {
-    listen 80;
     server_name {{ services.fedi_dk_nodebb.domain }};
+    listen 80;
+
+    set $upstream http://workers;
 
     proxy_set_header X-Real-IP $remote_addr;
     proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
@@ -30,15 +32,15 @@ server {
     gzip_types      text/plain application/xml text/javascript application/javascript application/x-javascript text/css application/json;
 
     location @nodebb {
-        proxy_pass http://workers;
+        proxy_pass $upstream;
     }
 
     location ~ ^/assets/(.*) {
         root /usr/src/app;
-        try_files /build/public/$1 /public/$1 @nodebb;
+        try_files /build/public/$1 @nodebb;
     }
 
     location / {
-        proxy_pass http://workers;
+        proxy_pass $upstream;
     }
 }
\ No newline at end of file