fix nginx config

Syntax3rror404 · Jan 11, 2024 · 8ac6751 · 8ac6751
1 parent 0dffe4d
commit 8ac6751
Show file tree

Hide file tree

Showing 2 changed files with 48 additions and 48 deletions.
diff --git a/helm/templates/nginx-conf-configmap.yaml b/helm/templates/nginx-conf-configmap.yaml
@@ -4,27 +4,33 @@ kind: ConfigMap
 metadata:
   name: nginx-conf
 data:
-  default.conf: |
-    server {
-        listen       80;
-        listen  [::]:80;
-        server_name  localhost;
+  nginx.conf: |
+    user  nginx;
+    worker_processes  auto;
 
-        #access_log  /var/log/nginx/host.access.log  main;
+    error_log  /var/log/nginx/error.log notice;
+    pid        /var/run/nginx.pid;
 
-        location / {
-            root   /usr/share/nginx/html;
-            index  index.html index.htm;
-            autoindex on;
-        }
+    events {
+        worker_connections  1024;
+    }
 
-        #error_page  404              /404.html;
+    http {
+        include       /etc/nginx/mime.types;
+        default_type  application/octet-stream;
 
-        # redirect server error pages to the static page /50x.html
-        #
-        error_page   500 502 503 504  /50x.html;
-        location = /50x.html {
-            root   /usr/share/nginx/html;
-        }
+        log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
+                          '$status $body_bytes_sent "$http_referer" '
+                          '"$http_user_agent" "$http_x_forwarded_for"';
 
+        access_log  /var/log/nginx/access.log  main;
+
+        sendfile        on;
+        #tcp_nopush     on;
+
+        keepalive_timeout  65;
+
+        #gzip  on;
+
+        include /etc/nginx/conf.d/*.conf;
     }
diff --git a/helm/templates/nginx-confd-configmap.yaml.yaml b/helm/templates/nginx-confd-configmap.yaml.yaml
@@ -4,33 +4,27 @@ kind: ConfigMap
 metadata:
   name: nginx-confd
 data:
-  nginx.conf: |
-    user  nginx;
-    worker_processes  auto;
-
-    error_log  /var/log/nginx/error.log notice;
-    pid        /var/run/nginx.pid;
-
-    events {
-        worker_connections  1024;
-    }
-
-    http {
-        include       /etc/nginx/mime.types;
-        default_type  application/octet-stream;
-
-        log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
-                          '$status $body_bytes_sent "$http_referer" '
-                          '"$http_user_agent" "$http_x_forwarded_for"';
-
-        access_log  /var/log/nginx/access.log  main;
-
-        sendfile        on;
-        #tcp_nopush     on;
-
-        keepalive_timeout  65;
-
-        #gzip  on;
-
-        include /etc/nginx/conf.d/*.conf;
-    }
+  default.conf: |
+    server {
+        listen       80;
+        listen  [::]:80;
+        server_name  localhost;
+
+        #access_log  /var/log/nginx/host.access.log  main;
+
+        location / {
+            root   /usr/share/nginx/html;
+            index  index.html index.htm;
+            autoindex on;
+        }
+
+        #error_page  404              /404.html;
+
+        # redirect server error pages to the static page /50x.html
+        #
+        error_page   500 502 503 504  /50x.html;
+        location = /50x.html {
+            root   /usr/share/nginx/html;
+        }
+
+    }