Fix rebase result, add S3 variable handling.

zammad · Jan 29, 2024 · cffcd8b · cffcd8b
1 parent 7c31ef5
commit cffcd8b
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/zammad/templates/_helpers.tpl b/zammad/templates/_helpers.tpl
@@ -119,6 +119,7 @@ S3 access URL
   value: "http://zammadadmin:zammadadmin@{{ template "zammad.fullname" . }}-minio:9000/zammad?region=zammad&force_path_style=true"
 {{- end -}}
 {{- end -}}
+{{- end -}}
 
 {{/*
 environment variables for the Zammad Rails stack
@@ -144,6 +145,7 @@ environment variables for the Zammad Rails stack
       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 }}"
+{{ include "zammad.env.S3_URL" . }}
 - name: TMP # All zammad containers need the possibility to create temporary files, e.g. for file uploads or image resizing.
   value: {{ .Values.zammadConfig.railsserver.tmpdir }}
 {{- with .Values.extraEnv }}