From 3b02fdd661fc67c9a36eee8067dfce934c5fd57b Mon Sep 17 00:00:00 2001
From: Lars Scheibling <lars@scheibling.se>
Date: Thu, 23 Mar 2023 09:11:41 +0100
Subject: [PATCH] Fixed bugs with too many brackets

---
 .gitlab-ci.yml                 |  2 +-
 Chart/Chart.yaml               |  2 +-
 Chart/templates/configmap.yaml | 18 +++++++++---------
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 558637c..6d422ae 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,5 +1,5 @@
 variables:
-  HELM_CHART_VERSION: "0.5.3"
+  HELM_CHART_VERSION: "0.5.4"
 
 stages:
   - deploy
diff --git a/Chart/Chart.yaml b/Chart/Chart.yaml
index cf62c16..a5d265e 100644
--- a/Chart/Chart.yaml
+++ b/Chart/Chart.yaml
@@ -2,5 +2,5 @@ apiVersion: v2
 name: cloudypress
 description: A helm chart for deploying Wordpress on Cloudyne Hosting
 type: application
-version: "0.5.2"
+version: "0.5.4"
 appVersion: "6.1.1"
diff --git a/Chart/templates/configmap.yaml b/Chart/templates/configmap.yaml
index 2e658be..10e2e4f 100644
--- a/Chart/templates/configmap.yaml
+++ b/Chart/templates/configmap.yaml
@@ -100,7 +100,7 @@ data:
         {{- end }}
 
         events {
-            {{- if and .Values.global .Values.global.nginx }}}
+            {{- if and .Values.global .Values.global.nginx }}
             worker_connections {{ .Values.global.nginx.workerConnections | default "1024" }};
             {{ .Values.global.nginx.eventsAdditions | default "" }}
             {{- else }}
@@ -121,7 +121,7 @@ data:
 
             access_log /dev/stdout main_timed;
             error_log /dev/stderr notice;
-            {{- if and .Values.global .Values.global.nginx }}}
+            {{- if and .Values.global .Values.global.nginx }}
             keepalive_timeout {{ .Values.global.nginx.keepaliveTimeout | default "61" }};
             {{- else }}
             keepalive_timeout 61;
@@ -138,7 +138,7 @@ data:
                 listen [::]:8080 default_server;
                 listen 8080 default_server;
                 server_name _;
-                {{- if and .Values.global .Values.global.nginx }}}
+                {{- if and .Values.global .Values.global.nginx }}
                 sendfile {{ .Values.global.nginx.sendfile | default "off" }};
                 tcp_nodelay {{ .Values.global.nginx.tcpNodelay | default "on" }};
                 absolute_redirect {{ .Values.global.nginx.absoluteRedirects | default "off" }};
@@ -148,7 +148,7 @@ data:
                 absolute_redirect off;
                 {{- end }}
                 
-                {{- if and .Values.site .Values.site.webroot }}}
+                {{- if and .Values.site .Values.site.webroot }}
                 root {{ .Values.site.webroot.path | default "/app/web" }};
                 index {{ .Values.site.webroot.indexes | default "index.php index.html index.htm" }};
                 {{- else }}
@@ -159,7 +159,7 @@ data:
     
                 location / {
                     try_files $uri $uri/ /index.php?q=$uri&$args;
-                    {{- if and .Values.global .Values.global.nginx }}}
+                    {{- if and .Values.global .Values.global.nginx }}
                     {{ .Values.global.nginx.rootLocationAdditions | default "" }}
                     {{- end }}
             
@@ -179,7 +179,7 @@ data:
                 }
 
                 location ~ \.php$ {
-                    {{- if and .Values.global .Values.global.nginx }}}
+                    {{- if and .Values.global .Values.global.nginx }}
                     fastcgi_buffer_size {{ .Values.global.nginx.fcgiBufferSize | default "128k" }};
                     fastcgi_buffers {{ .Values.global.nginx.fcgiBuffers | default "4 256k" }};
                     fastcgi_busy_buffers_size {{ .Values.global.nginx.fcgiBusyBufferSize | default "256k" }};
@@ -196,7 +196,7 @@ data:
                     fastcgi_pass 127.0.0.1:8123;
                     fastcgi_index index.php;
                     fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
-                    {{- if and .Values.global .Values.global.nginx }}}
+                    {{- if and .Values.global .Values.global.nginx }}
                     {{ .Values.global.nginx.phpLocationAdditions | default "" }}
                     {{- end }}                
                 }
@@ -245,7 +245,7 @@ data:
                     include fastcgi_params;
                     fastcgi_pass 127.0.0.1:8123;
                 }
-                {{- if and .Values.global .Values.global.nginx }}}
+                {{- if and .Values.global .Values.global.nginx }}
                 {{ .Values.global.nginx.serverAdditions | default "" }}
                 {{- end }}
             
@@ -258,7 +258,7 @@ data:
             add_header X-Content-Type-Options nosniff;
             add_header X-Frame-Options SAMEORIGIN;
             add_header X-XSS-Protection "1; mode=block";
-            {{- if and .Values.global .Values.global.nginx }}}
+            {{- if and .Values.global .Values.global.nginx }}
             {{ .Values.global.nginx.httpAdditions }}
             {{- end }}