From b4caa85cd4e5ba8ea2d53fcdaa413db739eabf82 Mon Sep 17 00:00:00 2001
From: Justin Tahara <105671973+justin-tahara@users.noreply.github.com>
Date: Mon, 6 Oct 2025 13:37:23 -0700
Subject: [PATCH] fix(infra): Nginx updates (#5627)

---
 deployment/helm/charts/onyx/Chart.yaml        |  2 +-
 .../charts/onyx/templates/nginx-conf.yaml     | 52 ++++++++++---------
 deployment/helm/charts/onyx/values.yaml       |  3 +-
 3 files changed, 29 insertions(+), 28 deletions(-)

diff --git a/deployment/helm/charts/onyx/Chart.yaml b/deployment/helm/charts/onyx/Chart.yaml
index bb645ad198..24570374cc 100644
--- a/deployment/helm/charts/onyx/Chart.yaml
+++ b/deployment/helm/charts/onyx/Chart.yaml
@@ -5,7 +5,7 @@ home: https://www.onyx.app/
 sources:
   - "https://github.com/onyx-dot-app/onyx"
 type: application
-version: 0.4.0
+version: 0.4.1
 appVersion: latest
 annotations:
   category: Productivity
diff --git a/deployment/helm/charts/onyx/templates/nginx-conf.yaml b/deployment/helm/charts/onyx/templates/nginx-conf.yaml
index 86d0bfb3a3..83bddf2834 100644
--- a/deployment/helm/charts/onyx/templates/nginx-conf.yaml
+++ b/deployment/helm/charts/onyx/templates/nginx-conf.yaml
@@ -12,32 +12,34 @@ data:
         server {{ include "onyx.fullname" . }}-webserver:{{ .Values.webserver.service.servicePort }} fail_timeout=0;
     }
 
-  server-snippet.conf: |
-    listen 1024;
-    server_name $$DOMAIN;
+  server.conf: |
+    server {
+        listen 1024;
+        server_name $$DOMAIN;
 
-    client_max_body_size 5G;
+        client_max_body_size 5G;
 
-    location ~ ^/api(.*)$ {
-        rewrite ^/api(/.*)$ $1 break;
-        proxy_set_header X-Real-IP $remote_addr;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header X-Forwarded-Proto $scheme;
-        proxy_set_header X-Forwarded-Host $host;
-        proxy_set_header Host $host;
-        proxy_http_version 1.1;
-        proxy_buffering off;
-        proxy_redirect off;
-        proxy_pass http://api_server;
-    }
+        location ~ ^/api(.*)$ {
+            rewrite ^/api(/.*)$ $1 break;
+            proxy_set_header X-Real-IP $remote_addr;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+            proxy_set_header X-Forwarded-Proto $scheme;
+            proxy_set_header X-Forwarded-Host $host;
+            proxy_set_header Host $host;
+            proxy_http_version 1.1;
+            proxy_buffering off;
+            proxy_redirect off;
+            proxy_pass http://api_server;
+        }
 
-    location / {
-        proxy_set_header X-Real-IP $remote_addr;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header X-Forwarded-Proto $scheme;
-        proxy_set_header X-Forwarded-Host $host;
-        proxy_set_header Host $host;
-        proxy_http_version 1.1;
-        proxy_redirect off;
-        proxy_pass http://web_server;
+        location / {
+            proxy_set_header X-Real-IP $remote_addr;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+            proxy_set_header X-Forwarded-Proto $scheme;
+            proxy_set_header X-Forwarded-Host $host;
+            proxy_set_header Host $host;
+            proxy_http_version 1.1;
+            proxy_redirect off;
+            proxy_pass http://web_server;
+        }
     }
diff --git a/deployment/helm/charts/onyx/values.yaml b/deployment/helm/charts/onyx/values.yaml
index be7d0f89be..d7d803e294 100644
--- a/deployment/helm/charts/onyx/values.yaml
+++ b/deployment/helm/charts/onyx/values.yaml
@@ -168,8 +168,7 @@ nginx:
         env DOMAIN;
       http-snippet: |
         include /etc/nginx/custom-snippets/upstreams.conf;
-      server-snippet: |
-        include /etc/nginx/custom-snippets/server-snippet.conf;
+        include /etc/nginx/custom-snippets/server.conf;
 
     # Mount the existing nginx ConfigMap that holds the upstream and server snippets
     extraVolumes: