Switch to Zammad 6.3 (#260)

* Improve handling of autowizard secret by mounting it in the FS directly. * Remove var folder. Add connection pool size parameter. * Make it a major version and add upgrading instructions.
zammad · Apr 17, 2024 · a5eaa8e · a5eaa8e
1 parent e82062b
commit a5eaa8e
Show file tree

Hide file tree

Showing 7 changed files with 44 additions and 43 deletions.
diff --git a/zammad/Chart.yaml b/zammad/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 name: zammad
-version: 10.3.4
-appVersion: 6.2.0-1
+version: 11.0.0
+appVersion: 6.3.0
 description: Zammad is a web based open source helpdesk/customer support system with many features to manage customer communication via several channels like telephone, facebook, twitter, chat and e-mails.
 home: https://zammad.org
 icon: https://raw.githubusercontent.com/zammad/zammad-documentation/main/images/zammad_logo_600x520.png
@@ -11,7 +11,7 @@ sources:
 maintainers:
   - name: monotek
     email: [email protected]
-  - name: martini
+  - name: mgruner
     email: [email protected]
 dependencies:
   - name: elasticsearch

diff --git a/zammad/README.md b/zammad/README.md
@@ -155,6 +155,18 @@ Now you can open <http://localhost:8080> in your browser.
 
 ## Upgrading
 
+### From Chart Version 10.x to 11.0.0
+
+- Minimum Zammad version is now 6.3.0, where there is no `var/` folder any more, and the related
+  mount points have been removed.
+- The handling of the Autowizard secret was simplified. It is no longer processed by an init container,
+  but instead mounted directly into the Zammad container. Therefore the secret must contain the actual
+  raw JSON value, and not the base64 encoded JSON. So if you use an existing Autowizard secret,
+  you will need to change it to contain the raw value now.
+- There is a new `.Values.zammadConfig.postgresql.options` setting that can be used to specify additional
+  settings for the database connection. By default it specifies Zammad's default Rails DB pool size of 50.
+  For large installations you may need to increase this value.
+
 ### From Chart Version 9.x to 10.0.0
 
 - all containers uses `readOnlyRootFilesystem: true` again

diff --git a/zammad/ci/full-secrets.yaml b/zammad/ci/full-secrets.yaml
@@ -33,7 +33,7 @@ type: Opaque
 ---
 apiVersion: v1
 data:
-  autowizard: ZXdvZ0lDSlZjMlZ5Y3lJNklGc0tJQ0FnSUhzS0lDQWdJQ0FnSW14dloybHVJam9nSW1Ga2JXbHVRR1Y0WVcxd2JHVXVZMjl0SWl3S0lDQWdJQ0FnSW1acGNuTjBibUZ0WlNJNklDSlVaWE4wSUVGa2JXbHVJaXdLSUNBZ0lDQWdJbXhoYzNSdVlXMWxJam9nSWtGblpXNTBJaXdLSUNBZ0lDQWdJbVZ0WVdsc0lqb2dJbUZrYldsdVFHVjRZVzF3YkdVdVkyOXRJaXdLSUNBZ0lDQWdJbkJoYzNOM2IzSmtJam9nSW5SbGMzUWlDaUFnSUNCOUxBb2dJQ0FnZXdvZ0lDQWdJQ0FpYkc5bmFXNGlPaUFpWVdkbGJuUXhRR1Y0WVcxd2JHVXVZMjl0SWl3S0lDQWdJQ0FnSW1acGNuTjBibUZ0WlNJNklDSkJaMlZ1ZENBeElpd0tJQ0FnSUNBZ0lteGhjM1J1WVcxbElqb2dJbFJsYzNRaUxBb2dJQ0FnSUNBaVpXMWhhV3dpT2lBaVlXZGxiblF4UUdWNFlXMXdiR1V1WTI5dElpd0tJQ0FnSUNBZ0luQmhjM04zYjNKa0lqb2dJblJsYzNRaUxBb2dJQ0FnSUNBaWNtOXNaWE1pT2lCYklrRm5aVzUwSWwwS0lDQWdJSDBLSUNCZExBb2dJQ0pIY205MWNITWlPaUJiQ2lBZ0lDQjdDaUFnSUNBZ0lDSnVZVzFsSWpvZ0luTnZiV1VnWjNKdmRYQXhJaXdLSUNBZ0lDQWdJblZ6WlhKeklqb2dXeUpoWkcxcGJrQmxlR0Z0Y0d4bExtTnZiU0lzSUNKaFoyVnVkREZBWlhoaGJYQnNaUzVqYjIwaVhRb2dJQ0FnZlN3S0lDQWdJSHNLSUNBZ0lDQWdJbTVoYldVaU9pQWlWWE5sY25NaUxBb2dJQ0FnSUNBaWRYTmxjbk1pT2lCYkltRmtiV2x1UUdWNFlXMXdiR1V1WTI5dElpd2dJbUZuWlc1ME1VQmxlR0Z0Y0d4bExtTnZiU0pkTEFvZ0lDQWdJQ0FpYzJsbmJtRjBkWEpsSWpvZ0ltUmxabUYxYkhRaUxBb2dJQ0FnSUNBaVpXMWhhV3hmWVdSa2NtVnpjMTlwWkNJNklERUtJQ0FnSUgwS0lDQmRMQW9nSUNKRGFHRnVibVZzY3lJNklGc0tJQ0FnSUhzS0lDQWdJQ0FnSW1sa0lqb2dNU3dLSUNBZ0lDQWdJbUZ5WldFaU9pQWlSVzFoYVd3Nk9rRmpZMjkxYm5RaUxBb2dJQ0FnSUNBaVozSnZkWEFpT2lBaVZYTmxjbk1pTEFvZ0lDQWdJQ0FpYjNCMGFXOXVjeUk2SUhzS0lDQWdJQ0FnSUNBaWFXNWliM1Z1WkNJNklIc0tJQ0FnSUNBZ0lDQWdJQ0poWkdGd2RHVnlJam9nSW1sdFlYQWlMQW9nSUNBZ0lDQWdJQ0FnSW05d2RHbHZibk1pT2lCN0NpQWdJQ0FnSUNBZ0lDQWdJQ0pvYjNOMElqb2dJbTE0TVM1bGVHRnRjR3hsTG1OdmJTSXNDaUFnSUNBZ0lDQWdJQ0FnSUNKMWMyVnlJam9nSW01dmRGOWxlR2x6ZEdsdVp5SXNDaUFnSUNBZ0lDQWdJQ0FnSUNKd1lYTnpkMjl5WkNJNklDSnViM1JmWlhocGMzUnBibWNpTEFvZ0lDQWdJQ0FnSUNBZ0lDQWljM05zSWpvZ0luTnpiQ0lLSUNBZ0lDQWdJQ0FnSUgwS0lDQWdJQ0FnSUNCOUxBb2dJQ0FnSUNBZ0lDSnZkWFJpYjNWdVpDSTZJSHNLSUNBZ0lDQWdJQ0FnSUNKaFpHRndkR1Z5SWpvZ0luTmxibVJ0WVdsc0lnb2dJQ0FnSUNBZ0lIMEtJQ0FnSUNBZ2ZRb2dJQ0FnZlFvZ0lGMHNDaUFnSWtWdFlXbHNRV1JrY21WemMyVnpJam9nV3dvZ0lDQWdld29nSUNBZ0lDQWlhV1FpT2lBeExBb2dJQ0FnSUNBaVkyaGhibTVsYkY5cFpDSTZJREVzQ2lBZ0lDQWdJQ0p1WVcxbElqb2dJbHBoYlcxaFpDQklaV3h3WkdWemF5SXNDaUFnSUNBZ0lDSmxiV0ZwYkNJNklDSjZZVzF0WVdSQWJHOWpZV3hvYjNOMElnb2dJQ0FnZlFvZ0lGMHNDaUFnSWxObGRIUnBibWR6SWpvZ1d3b2dJQ0FnZXdvZ0lDQWdJQ0FpYm1GdFpTSTZJQ0p3Y205a2RXTjBYMjVoYldVaUxBb2dJQ0FnSUNBaWRtRnNkV1VpT2lBaVdtRnRiV0ZrSUZSbGMzUWdVM2x6ZEdWdElnb2dJQ0FnZlN3S0lDQWdJSHNLSUNBZ0lDQWdJbTVoYldVaU9pQWlaR1YyWld4dmNHVnlYMjF2WkdVaUxBb2dJQ0FnSUNBaWRtRnNkV1VpT2lCMGNuVmxDaUFnSUNCOUNpQWdYU3dLSUNBaVZHVjRkRTF2WkhWc1pVeHZZMkZzWlNJNklIc0tJQ0FnSUNKTWIyTmhiR1VpT2lBaVpHVXRaR1VpQ2lBZ2ZRcDlDZz09
+  autowizard: ewogICJVc2VycyI6IFsKICAgIHsKICAgICAgImxvZ2luIjogImFkbWluQGV4YW1wbGUuY29tIiwKICAgICAgImZpcnN0bmFtZSI6ICJUZXN0IEFkbWluIiwKICAgICAgImxhc3RuYW1lIjogIkFnZW50IiwKICAgICAgImVtYWlsIjogImFkbWluQGV4YW1wbGUuY29tIiwKICAgICAgInBhc3N3b3JkIjogInRlc3QiCiAgICB9LAogICAgewogICAgICAibG9naW4iOiAiYWdlbnQxQGV4YW1wbGUuY29tIiwKICAgICAgImZpcnN0bmFtZSI6ICJBZ2VudCAxIiwKICAgICAgImxhc3RuYW1lIjogIlRlc3QiLAogICAgICAiZW1haWwiOiAiYWdlbnQxQGV4YW1wbGUuY29tIiwKICAgICAgInBhc3N3b3JkIjogInRlc3QiLAogICAgICAicm9sZXMiOiBbIkFnZW50Il0KICAgIH0KICBdLAogICJHcm91cHMiOiBbCiAgICB7CiAgICAgICJuYW1lIjogInNvbWUgZ3JvdXAxIiwKICAgICAgInVzZXJzIjogWyJhZG1pbkBleGFtcGxlLmNvbSIsICJhZ2VudDFAZXhhbXBsZS5jb20iXQogICAgfSwKICAgIHsKICAgICAgIm5hbWUiOiAiVXNlcnMiLAogICAgICAidXNlcnMiOiBbImFkbWluQGV4YW1wbGUuY29tIiwgImFnZW50MUBleGFtcGxlLmNvbSJdLAogICAgICAic2lnbmF0dXJlIjogImRlZmF1bHQiLAogICAgICAiZW1haWxfYWRkcmVzc19pZCI6IDEKICAgIH0KICBdLAogICJDaGFubmVscyI6IFsKICAgIHsKICAgICAgImlkIjogMSwKICAgICAgImFyZWEiOiAiRW1haWw6OkFjY291bnQiLAogICAgICAiZ3JvdXAiOiAiVXNlcnMiLAogICAgICAib3B0aW9ucyI6IHsKICAgICAgICAiaW5ib3VuZCI6IHsKICAgICAgICAgICJhZGFwdGVyIjogImltYXAiLAogICAgICAgICAgIm9wdGlvbnMiOiB7CiAgICAgICAgICAgICJob3N0IjogIm14MS5leGFtcGxlLmNvbSIsCiAgICAgICAgICAgICJ1c2VyIjogIm5vdF9leGlzdGluZyIsCiAgICAgICAgICAgICJwYXNzd29yZCI6ICJub3RfZXhpc3RpbmciLAogICAgICAgICAgICAic3NsIjogInNzbCIKICAgICAgICAgIH0KICAgICAgICB9LAogICAgICAgICJvdXRib3VuZCI6IHsKICAgICAgICAgICJhZGFwdGVyIjogInNlbmRtYWlsIgogICAgICAgIH0KICAgICAgfQogICAgfQogIF0sCiAgIkVtYWlsQWRkcmVzc2VzIjogWwogICAgewogICAgICAiaWQiOiAxLAogICAgICAiY2hhbm5lbF9pZCI6IDEsCiAgICAgICJuYW1lIjogIlphbW1hZCBIZWxwZGVzayIsCiAgICAgICJlbWFpbCI6ICJ6YW1tYWRAbG9jYWxob3N0IgogICAgfQogIF0sCiAgIlNldHRpbmdzIjogWwogICAgewogICAgICAibmFtZSI6ICJwcm9kdWN0X25hbWUiLAogICAgICAidmFsdWUiOiAiWmFtbWFkIFRlc3QgU3lzdGVtIgogICAgfSwKICAgIHsKICAgICAgIm5hbWUiOiAiZGV2ZWxvcGVyX21vZGUiLAogICAgICAidmFsdWUiOiB0cnVlCiAgICB9CiAgXSwKICAiVGV4dE1vZHVsZUxvY2FsZSI6IHsKICAgICJMb2NhbGUiOiAiZGUtZGUiCiAgfQp9Cg==
 kind: Secret
 metadata:
   name: autowizard

diff --git a/zammad/templates/configmap-init.yaml b/zammad/templates/configmap-init.yaml
@@ -25,12 +25,9 @@ data:
   zammad-init: |-
     #!/bin/bash
     set -e
-    if [ -n "${AUTOWIZARD_JSON}" ]; then
-        echo "${AUTOWIZARD_JSON}" | base64 -d > /opt/zammad/var/auto_wizard.json
-    fi
-      {{- with .Values.zammadConfig.initContainers.zammad.customInit }}
-        {{- . | nindent 4 }}
-      {{- end }}
+    {{- with .Values.zammadConfig.initContainers.zammad.customInit }}
+      {{- . | nindent 4 }}
+    {{- end }}
     echo "zammad init complete :)"
 {{ if .Values.zammadConfig.elasticsearch.initialisation }}
   elasticsearch-init: |-

diff --git a/zammad/templates/secrets.yaml b/zammad/templates/secrets.yaml
@@ -7,7 +7,7 @@ metadata:
     {{- include "zammad.labels" . | nindent 4 }}
 type: Opaque
 data:
-  {{ .Values.secrets.autowizard.secretKey }}: {{ .Values.autoWizard.config | b64enc | b64enc | quote }}
+  {{ .Values.secrets.autowizard.secretKey }}: {{ .Values.autoWizard.config | b64enc | quote }}
 {{ end }}
 {{ if and .Values.zammadConfig.elasticsearch.pass (not .Values.secrets.elasticsearch.useExisting) }}
 ---

diff --git a/zammad/templates/statefulset.yaml b/zammad/templates/statefulset.yaml
@@ -50,7 +50,6 @@ spec:
             - /bin/sh
             - -cx
             - |
-              chown {{ .Values.securityContext.runAsUser }}:{{ .Values.securityContext.runAsGroup }} -R /opt/zammad/var
               chmod 770 /opt/zammad/tmp
           {{- with .Values.zammadConfig.initContainers.volumePermissions.resources }}
           resources:
@@ -63,8 +62,6 @@ spec:
           volumeMounts:
             - name: {{ template "zammad.fullname" . }}-tmp
               mountPath: /opt/zammad/tmp
-            - name: {{ template "zammad.fullname" . }}-var
-              mountPath: /opt/zammad/var
         {{- end }}
         - name: postgresql-init
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
@@ -87,7 +84,7 @@ spec:
                   name: {{ template "zammad.postgresqlSecretName" . }}
                   key: {{ .Values.secrets.postgresql.secretKey }}
             - name: DATABASE_URL
-              value: "postgres://{{ .Values.zammadConfig.postgresql.user }}:$(POSTGRESQL_PASS)@{{ if .Values.zammadConfig.postgresql.enabled }}{{ .Release.Name }}-postgresql{{ else }}{{ .Values.zammadConfig.postgresql.host }}{{ end }}:{{ .Values.zammadConfig.postgresql.port }}/{{ .Values.zammadConfig.postgresql.db }}"
+              value: "postgres://{{ .Values.zammadConfig.postgresql.user }}:$(POSTGRESQL_PASS)@{{ if .Values.zammadConfig.postgresql.enabled }}{{ .Release.Name }}-postgresql{{ else }}{{ .Values.zammadConfig.postgresql.host }}{{ end }}:{{ .Values.zammadConfig.postgresql.port }}/{{ .Values.zammadConfig.postgresql.db }}?{{ .Values.zammadConfig.postgresql.options }}"
             {{ include "zammad.env.S3_URL" . | nindent 12 }}
           {{- if .Values.extraEnv }}
             {{- toYaml .Values.extraEnv | nindent 12 }}
@@ -109,8 +106,7 @@ spec:
               mountPath: /opt/zammad/tmp
             - name: {{ template "zammad.fullname" . }}-var
               mountPath: /opt/zammad/storage
-            - name: {{ template "zammad.fullname" . }}-var
-              mountPath: /opt/zammad/var
+      {{- if .Values.zammadConfig.initContainers.zammad.customInit }}
         - name: zammad-init
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
@@ -132,15 +128,8 @@ spec:
                   name: {{ template "zammad.postgresqlSecretName" . }}
                   key: {{ .Values.secrets.postgresql.secretKey }}
             - name: DATABASE_URL
-              value: "postgres://{{ .Values.zammadConfig.postgresql.user }}:$(POSTGRESQL_PASS)@{{ if .Values.zammadConfig.postgresql.enabled }}{{ .Release.Name }}-postgresql{{ else }}{{ .Values.zammadConfig.postgresql.host }}{{ end }}:{{ .Values.zammadConfig.postgresql.port }}/{{ .Values.zammadConfig.postgresql.db }}"
+              value: "postgres://{{ .Values.zammadConfig.postgresql.user }}:$(POSTGRESQL_PASS)@{{ if .Values.zammadConfig.postgresql.enabled }}{{ .Release.Name }}-postgresql{{ else }}{{ .Values.zammadConfig.postgresql.host }}{{ end }}:{{ .Values.zammadConfig.postgresql.port }}/{{ .Values.zammadConfig.postgresql.db }}?{{ .Values.zammadConfig.postgresql.options }}"
             {{ include "zammad.env.S3_URL" . | nindent 12 }}
-          {{- if .Values.autoWizard.enabled }}
-            - name: AUTOWIZARD_JSON
-              valueFrom:
-                secretKeyRef:
-                  name: {{ template "zammad.autowizardSecretName" . }}
-                  key: {{ .Values.secrets.autowizard.secretKey }}
-          {{- end }}
           {{- if .Values.extraEnv }}
           {{- toYaml .Values.extraEnv | nindent 12 }}
           {{- end }}
@@ -161,8 +150,7 @@ spec:
               mountPath: /opt/zammad/tmp
             - name: {{ template "zammad.fullname" . }}-var
               mountPath: /opt/zammad/storage
-            - name: {{ template "zammad.fullname" . }}-var
-              mountPath: /opt/zammad/var
+        {{- end }}
         {{- if .Values.zammadConfig.elasticsearch.initialisation }}
         - name: elasticsearch-init
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
@@ -185,7 +173,7 @@ spec:
                   name: {{ template "zammad.postgresqlSecretName" . }}
                   key: {{ .Values.secrets.postgresql.secretKey }}
             - name: DATABASE_URL
-              value: "postgres://{{ .Values.zammadConfig.postgresql.user }}:$(POSTGRESQL_PASS)@{{ if .Values.zammadConfig.postgresql.enabled }}{{ .Release.Name }}-postgresql{{ else }}{{ .Values.zammadConfig.postgresql.host }}{{ end }}:{{ .Values.zammadConfig.postgresql.port }}/{{ .Values.zammadConfig.postgresql.db }}"
+              value: "postgres://{{ .Values.zammadConfig.postgresql.user }}:$(POSTGRESQL_PASS)@{{ if .Values.zammadConfig.postgresql.enabled }}{{ .Release.Name }}-postgresql{{ else }}{{ .Values.zammadConfig.postgresql.host }}{{ end }}:{{ .Values.zammadConfig.postgresql.port }}/{{ .Values.zammadConfig.postgresql.db }}?{{ .Values.zammadConfig.postgresql.options }}"
             {{ include "zammad.env.S3_URL" . | nindent 12 }}
           {{- if or .Values.zammadConfig.elasticsearch.pass .Values.secrets.elasticsearch.useExisting }}
             - name: ELASTICSEARCH_PASSWORD
@@ -214,8 +202,6 @@ spec:
             mountPath: /opt/zammad/tmp
           - name: {{ template "zammad.fullname" . }}-var
             mountPath: /opt/zammad/storage
-          - name: {{ template "zammad.fullname" . }}-var
-            mountPath: /opt/zammad/var
         {{- end }}
       containers:
         {{- with .Values.sidecars }}
@@ -266,8 +252,6 @@ spec:
               mountPath: /var/log/nginx
             - name: {{ template "zammad.fullname" . }}-var
               mountPath: /opt/zammad/storage
-            - name: {{ include "zammad.fullname" . }}-var
-              mountPath: /opt/zammad/var
         - name: {{ .Chart.Name }}-railsserver
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
@@ -286,7 +270,7 @@ spec:
               value: {{ .Values.zammadConfig.railsserver.tmpdir }}
           {{- if .Values.autoWizard.enabled }}
             - name: AUTOWIZARD_RELATIVE_PATH
-              value: var/auto_wizard.json
+              value: tmp/auto_wizard/auto_wizard.json
           {{- end }}
           {{- if or .Values.zammadConfig.redis.pass .Values.secrets.redis.useExisting }}
             - name: REDIS_PASSWORD
@@ -307,7 +291,7 @@ spec:
                   name: {{ template "zammad.postgresqlSecretName" . }}
                   key: {{ .Values.secrets.postgresql.secretKey }}
             - name: DATABASE_URL
-              value: "postgres://{{ .Values.zammadConfig.postgresql.user }}:$(POSTGRESQL_PASS)@{{ if .Values.zammadConfig.postgresql.enabled }}{{ .Release.Name }}-postgresql{{ else }}{{ .Values.zammadConfig.postgresql.host }}{{ end }}:{{ .Values.zammadConfig.postgresql.port }}/{{ .Values.zammadConfig.postgresql.db }}"
+              value: "postgres://{{ .Values.zammadConfig.postgresql.user }}:$(POSTGRESQL_PASS)@{{ if .Values.zammadConfig.postgresql.enabled }}{{ .Release.Name }}-postgresql{{ else }}{{ .Values.zammadConfig.postgresql.host }}{{ end }}:{{ .Values.zammadConfig.postgresql.port }}/{{ .Values.zammadConfig.postgresql.db }}?{{ .Values.zammadConfig.postgresql.options }}"
             {{ include "zammad.env.S3_URL" . | nindent 12 }}
           {{- if .Values.extraEnv }}
           {{- toYaml .Values.extraEnv | nindent 12 }}
@@ -338,8 +322,10 @@ spec:
               mountPath: /opt/zammad/tmp
             - name: {{ template "zammad.fullname" . }}-var
               mountPath: /opt/zammad/storage
-            - name: {{ template "zammad.fullname" . }}-var
-              mountPath: /opt/zammad/var
+          {{- if .Values.autoWizard.enabled }}
+            - name: autowizard
+              mountPath: "/opt/zammad/tmp/auto_wizard"
+          {{- end }}
         - name: {{ .Chart.Name }}-scheduler
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
@@ -366,7 +352,7 @@ spec:
                   name: {{ template "zammad.postgresqlSecretName" . }}
                   key: {{ .Values.secrets.postgresql.secretKey }}
             - name: DATABASE_URL
-              value: "postgres://{{ .Values.zammadConfig.postgresql.user }}:$(POSTGRESQL_PASS)@{{ if .Values.zammadConfig.postgresql.enabled }}{{ .Release.Name }}-postgresql{{ else }}{{ .Values.zammadConfig.postgresql.host }}{{ end }}:{{ .Values.zammadConfig.postgresql.port }}/{{ .Values.zammadConfig.postgresql.db }}"
+              value: "postgres://{{ .Values.zammadConfig.postgresql.user }}:$(POSTGRESQL_PASS)@{{ if .Values.zammadConfig.postgresql.enabled }}{{ .Release.Name }}-postgresql{{ else }}{{ .Values.zammadConfig.postgresql.host }}{{ end }}:{{ .Values.zammadConfig.postgresql.port }}/{{ .Values.zammadConfig.postgresql.db }}?{{ .Values.zammadConfig.postgresql.options }}"
             {{ include "zammad.env.S3_URL" . | nindent 12 }}
           {{- if .Values.extraEnv }}
           {{- toYaml .Values.extraEnv | nindent 12 }}
@@ -386,8 +372,6 @@ spec:
               mountPath: /opt/zammad/tmp
             - name: {{ template "zammad.fullname" . }}-var
               mountPath: /opt/zammad/storage
-            - name: {{ template "zammad.fullname" . }}-var
-              mountPath: /opt/zammad/var
         - name: {{ .Chart.Name }}-websocket
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
@@ -418,7 +402,7 @@ spec:
                   name: {{ template "zammad.postgresqlSecretName" . }}
                   key: {{ .Values.secrets.postgresql.secretKey }}
             - name: DATABASE_URL
-              value: "postgres://{{ .Values.zammadConfig.postgresql.user }}:$(POSTGRESQL_PASS)@{{ if .Values.zammadConfig.postgresql.enabled }}{{ .Release.Name }}-postgresql{{ else }}{{ .Values.zammadConfig.postgresql.host }}{{ end }}:{{ .Values.zammadConfig.postgresql.port }}/{{ .Values.zammadConfig.postgresql.db }}"
+              value: "postgres://{{ .Values.zammadConfig.postgresql.user }}:$(POSTGRESQL_PASS)@{{ if .Values.zammadConfig.postgresql.enabled }}{{ .Release.Name }}-postgresql{{ else }}{{ .Values.zammadConfig.postgresql.host }}{{ end }}:{{ .Values.zammadConfig.postgresql.port }}/{{ .Values.zammadConfig.postgresql.db }}?{{ .Values.zammadConfig.postgresql.options }}"
             {{ include "zammad.env.S3_URL" . | nindent 12 }}
           {{- if .Values.extraEnv }}
           {{- toYaml .Values.extraEnv | nindent 12 }}
@@ -449,13 +433,19 @@ spec:
               mountPath: /opt/zammad/tmp
             - name: {{ template "zammad.fullname" . }}-var
               mountPath: /opt/zammad/storage
-            - name: {{ template "zammad.fullname" . }}-var
-              mountPath: /opt/zammad/var
       {{- with .Values.securityContext }}
       securityContext:
         {{- toYaml . | nindent 8 }}
       {{- end }}
       volumes:
+      {{- if .Values.autoWizard.enabled }}
+        - name: autowizard
+          secret:
+            secretName: {{ template "zammad.autowizardSecretName" . }}
+            items:
+            - key: {{ .Values.secrets.autowizard.secretKey }}
+              path: auto_wizard.json
+      {{- end }}
         - name: {{ template "zammad.fullname" . }}-init
           configMap:
             name: {{ template "zammad.fullname" . }}-init

diff --git a/zammad/values.yaml b/zammad/values.yaml
@@ -142,6 +142,8 @@ zammadConfig:
     port: 5432
     # needs to be the same as the postgresql.auth.username
     user: zammad
+    # additional connection options
+    options: "pool=50"
 
   railsserver:
     livenessProbe:
@@ -318,7 +320,7 @@ extraEnv: []
   #   value: "foobar"
 
 # autowizard config
-# if a token is used the url hast to look like: http://zammad/#getting_started/auto_wizard/your_token_here
+# if a token is used the url must look like: http://zammad/#getting_started/auto_wizard/your_token_here
 autoWizard:
   enabled: false
   # string with the autowizard config as json