From 60068ad187ab45c1baecddcda08333902180f439 Mon Sep 17 00:00:00 2001
From: Aakash Singh <mail@singhaakash.dev>
Date: Wed, 25 Sep 2024 14:37:16 +0530
Subject: [PATCH] resolve conflicts (#8619)

---
 nginx/nginx.conf | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/nginx/nginx.conf b/nginx/nginx.conf
index e9ece31ea0e..5ad797a13ec 100644
--- a/nginx/nginx.conf
+++ b/nginx/nginx.conf
@@ -1,13 +1,21 @@
 server {
-  listen 80;
-  root /usr/share/nginx/html;
 
-  location = /index.html {
-    expires 6h;
+  include mime.types;
+  types {
+    text/javascript js mjs;
   }
 
+  listen 80;
+
   location / {
-    expires 7d;
+    root   /usr/share/nginx/html;
+    index  index.html index.htm;
     try_files $uri $uri/ /index.html;
   }
+
+  error_page   500 502 503 504  /50x.html;
+
+  location = /50x.html {
+    root   /usr/share/nginx/html;
+  }
 }