Fix ing, deployment

.gitlab-ci.yml

@@ -1,5 +1,5 @@
 variables:
-  HELM_CHART_VERSION: "1.0.13"
+  HELM_CHART_VERSION: "1.0.14"
 
 stages:
   - deploy

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

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 }}

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"