diff --git a/charts/funkwhale/templates/configmap.yaml b/charts/funkwhale/templates/configmap.yaml index b0f5660..c7911a0 100644 --- a/charts/funkwhale/templates/configmap.yaml +++ b/charts/funkwhale/templates/configmap.yaml @@ -23,21 +23,21 @@ data: DJANGO_ALLOWED_HOSTS: '*' -{{- if .Values.s3.enabled -}} +{{- if .Values.s3.enabled }} AWS_ACCESS_KEY_ID: {{ .Values.s3.accessKey }} AWS_SECRET_ACCESS_KEY: {{ .Values.s3.secretKey }} AWS_STORAGE_BUCKET_NAME: {{ .Values.s3.bucket }} - {{- if .Values.s3.region -}} + {{- if .Values.s3.region }} AWS_S3_REGION_NAME: {{ .Values.s3.region }} - {{- end -}} - {{- if .Values.s3.location -}} + {{- end }} + {{- if .Values.s3.location }} AWS_LOCATION: {{ .Values.s3.location }} - {{- end -}} - {{- if .Values.s3.url -}} + {{- end }} + {{- if .Values.s3.url }} AWS_S3_ENDPOINT_URL: {{ .Values.s3.url }} - {{- end -}} + {{- end }} PROXY_MEDIA: {{ .Values.s3.proxy | quote }} -{{- end -}} +{{- end }} {{- with .Values.extraEnv -}} {{- toYaml . | nindent 2 }} diff --git a/charts/funkwhale/templates/secret.yaml b/charts/funkwhale/templates/secret.yaml index eaab21e..fbc05a1 100644 --- a/charts/funkwhale/templates/secret.yaml +++ b/charts/funkwhale/templates/secret.yaml @@ -12,6 +12,6 @@ data: DATABASE_URL: {{ include "funkwhale.dbUrl" . | b64enc }} DJANGO_SECRET_KEY: {{ .Values.djangoSecret | b64enc }} -{{- range $key, $val := .Values.extraSecret -}} +{{- range $key, $val := .Values.extraSecret }} {{ $key }}: {{ $val | b64enc }} -{{- end -}} +{{- end }}