fix(mycloud-*): switch to b64enc default password for database

This commit is contained in:
WrenIX 2024-02-14 15:22:32 +01:00
parent 72c4567e60
commit 98af734f12
Signed by: wrenix
GPG key ID: 7AFDB012974B1BB5
5 changed files with 5 additions and 5 deletions

View file

@ -27,7 +27,7 @@ spec:
host: {{ .Values.database.host | quote }} host: {{ .Values.database.host | quote }}
name: {{ .Values.database.name | quote }} name: {{ .Values.database.name | quote }}
user: {{ .Values.database.username | quote }} user: {{ .Values.database.username | quote }}
password: {{ .Values.database.password | default (derivePassword 1 "long" .Values.commons.masterPassword "authentik" "database_password") | quote }} password: {{ .Values.database.password | default (derivePassword 1 "long" .Values.commons.masterPassword "authentik" "database_password" | b64enc) | quote }}
email: email:
host: {{ .Values.commons.mail.host | quote }} host: {{ .Values.commons.mail.host | quote }}
username: {{ .Values.commons.mail.username | quote }} username: {{ .Values.commons.mail.username | quote }}

View file

@ -31,7 +31,7 @@ spec:
type: postgres type: postgres
address: {{ .Values.database.host | quote }} address: {{ .Values.database.host | quote }}
username: {{ .Values.database.username | quote }} username: {{ .Values.database.username | quote }}
password: {{ .Values.database.password | default (derivePassword 1 "long" .Values.commons.masterPassword "gotosocial" "database_password") | quote }} password: {{ .Values.database.password | default (derivePassword 1 "long" .Values.commons.masterPassword "gotosocial" "database_password" | b64enc) | quote }}
database: {{ .Values.database.name | quote }} database: {{ .Values.database.name | quote }}
accounts: accounts:
registrationOpen: false registrationOpen: false

View file

@ -164,7 +164,7 @@ spec:
externalPostgresql: externalPostgresql:
host: {{ .Values.databases.server.host | quote }} host: {{ .Values.databases.server.host | quote }}
username: {{ .Values.databases.server.username | quote }} username: {{ .Values.databases.server.username | quote }}
password: {{ .Values.databases.server.password | default (derivePassword 1 "long" .Values.commons.masterPassword "matrix-synapse" "database_password") | quote }} password: {{ .Values.databases.server.password | default (derivePassword 1 "long" .Values.commons.masterPassword "matrix-synapse" "database_password" | b64enc) | quote }}
database: {{ .Values.databases.server.name | quote }} database: {{ .Values.databases.server.name | quote }}
prometheus: prometheus:

View file

@ -246,4 +246,4 @@ spec:
host: {{ .Values.database.host | quote }} host: {{ .Values.database.host | quote }}
database: {{ .Values.database.name | quote }} database: {{ .Values.database.name | quote }}
user: {{ .Values.database.username | quote }} user: {{ .Values.database.username | quote }}
password: {{ .Values.database.password | default (derivePassword 1 "long" .Values.commons.masterPassword "nextcloud" "database_password") | quote }} password: {{ .Values.database.password | default (derivePassword 1 "long" .Values.commons.masterPassword "nextcloud" "database_password" | b64enc) | quote }}

View file

@ -9,6 +9,6 @@ stringData:
users: users:
{{- range $database, $config := .Values.databases }} {{- range $database, $config := .Values.databases }}
{{- if (eq $config.type "postgresql") }} {{- if (eq $config.type "postgresql") }}
{{ $config.username | default $database }}: {{ $config.password | default (derivePassword 1 "long" $.Values.commons.masterPassword $database "database_password") | quote }} {{ $config.username | default $database }}: {{ $config.password | default (derivePassword 1 "long" $.Values.commons.masterPassword $database "database_password" | b64enc) | quote }}
{{- end }} {{- end }}
{{- end }} {{- end }}