From 9793780639612c9c4c21a73de7ef28bb6a1b52a1 Mon Sep 17 00:00:00 2001
From: Lars <lars.scheibling@hoglandet.se>
Date: Wed, 13 Sep 2023 13:43:29 +0200
Subject: [PATCH] Fix ing, deployment

---
 .gitlab-ci.yml                  | 2 +-
 Chart/templates/deployment.yaml | 5 +----
 Chart/templates/ingress.yaml    | 4 +++-
 Chart/values.yaml               | 6 ++++++
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ae0ee42..6ec84d4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,5 +1,5 @@
 variables:
-  HELM_CHART_VERSION: "1.0.13"
+  HELM_CHART_VERSION: "1.0.14"
 
 stages:
   - deploy
diff --git a/Chart/templates/deployment.yaml b/Chart/templates/deployment.yaml
index e80b9b7..caf644a 100644
--- a/Chart/templates/deployment.yaml
+++ b/Chart/templates/deployment.yaml
@@ -74,7 +74,7 @@ spec:
         {{- end }}
       {{- end }}
       initContainers:
-      {{- if and .Values.storage.cloud.active .Values.storage.local.active }}
+      {{- if and .Values.storage.cloud.active .Values.storage.local.active .Values.storage.local.cloneCloud }}
         - name: init-local-storage
           securityContext:
             allowPrivilegeEscalation: false
@@ -140,9 +140,6 @@ spec:
           image: "{{ .Values.site.image }}"
           imagePullPolicy: IfNotPresent
           volumeMounts:
-            - name: serverconfig
-              mountPath: /init-go/config.json
-              subPath: init.json
             - name: serverconfig 
               mountPath: /docker-entrypoint.d/unit.json
               subPath: unit.json
diff --git a/Chart/templates/ingress.yaml b/Chart/templates/ingress.yaml
index 32ae29f..5f6f3c5 100644
--- a/Chart/templates/ingress.yaml
+++ b/Chart/templates/ingress.yaml
@@ -9,7 +9,7 @@ metadata:
     {{- include "..labels" . | nindent 4 }}
 spec:
   ingressClassName: nginx
-{{- if and .Values.site.certificate.certManager .Values.site.certificate.importCert }}
+{{- if or .Values.site.certificate.certManager .Values.site.certificate.importCert }}
   tls: 
     - secretName: {{ include "..fullname" . }}-cert-secret
       hosts: {{ include "..domains" . | nindent 6 }}
@@ -20,6 +20,7 @@ spec:
 {{- end }}    
   rules:
     {{- range include "..domains" . | split "\n" }}
+    {{- if ne . "" }}
     - host: {{ . | replace "- " ""}}
       http:
         paths:
@@ -30,4 +31,5 @@ spec:
                 name: {{ include "..fullname" $ }}
                 port:
                   number: 80
+    {{- end }}
     {{- end }}
\ No newline at end of file
diff --git a/Chart/values.yaml b/Chart/values.yaml
index 62582c1..6ab6254 100644
--- a/Chart/values.yaml
+++ b/Chart/values.yaml
@@ -115,6 +115,7 @@ storage:
 
   local:
     active: true
+    cloneCloud: False
     class: "longhorn"
 
   folders:
@@ -153,6 +154,11 @@ email:
   emails:
     - email
 
+unit:
+  maxProc: 5
+  spareProc: 2
+  spareProcTimeout: 30
+
 php:
   logErrors: "On"
   displayErrors: "Off"