DevOps/truecharts
2
0
Fork 0
Code Issues Pull Requests Actions 27 Packages Projects Releases 1 Wiki Activity

fix(vaultwarden): don't base64 encode secret anymore

Browse Source
This commit is contained in:
Kjeld Schouten-Lebbing
2023-03-06 22:54:38 +01:00
parent b5f09feffc
commit 4eb1f1bf29
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
charts/enterprise/vaultwarden/Chart.yaml
+1 -1
View File
@@ -25,7 +25,7 @@ sources:
- https://github.com/truecharts/charts/tree/master/charts/enterprise/vaultwarden - https://github.com/truecharts/charts/tree/master/charts/enterprise/vaultwarden
- https://github.com/dani-garcia/vaultwarden - https://github.com/dani-garcia/vaultwarden
type: application type: application
version: 20.0.4 version: 20.0.5
annotations: annotations:
truecharts.org/catagories: | truecharts.org/catagories: |
- security - security
charts/enterprise/vaultwarden/templates/_secrets.tpl
+5 -5
View File
@@ -3,17 +3,17 @@
{{- $adminToken := "" }} {{- $adminToken := "" }}
{{- if eq .Values.vaultwarden.admin.enabled true }} {{- if eq .Values.vaultwarden.admin.enabled true }}
{{- $adminToken = .Values.vaultwarden.admin.token | default (randAlphaNum 48) | b64enc | quote }} {{- $adminToken = .Values.vaultwarden.admin.token | default (randAlphaNum 48) | quote }}
{{- end -}} {{- end -}}
{{- $smtpUser := "" }} {{- $smtpUser := "" }}
{{- if and (eq .Values.vaultwarden.smtp.enabled true ) (.Values.vaultwarden.smtp.user) }} {{- if and (eq .Values.vaultwarden.smtp.enabled true ) (.Values.vaultwarden.smtp.user) }}
{{- $smtpUser = .Values.vaultwarden.smtp.user | b64enc | quote }} {{- $smtpUser = .Values.vaultwarden.smtp.user | quote }}
{{- end -}} {{- end -}}
{{- $yubicoClientId := "" }} {{- $yubicoClientId := "" }}
{{- if eq .Values.vaultwarden.yubico.enabled true }} {{- if eq .Values.vaultwarden.yubico.enabled true }}
{{- $yubicoClientId = required "Yubico Client ID required" .Values.vaultwarden.yubico.clientId | toString | b64enc | quote }} {{- $yubicoClientId = required "Yubico Client ID required" .Values.vaultwarden.yubico.clientId | toString | quote }}
{{- end -}} {{- end -}}
enabled: true enabled: true
data: data:
@@ -23,10 +23,10 @@ data:
{{- end }} {{- end }}
{{- if ne $smtpUser "" }} {{- if ne $smtpUser "" }}
SMTP_USERNAME: {{ $smtpUser }} SMTP_USERNAME: {{ $smtpUser }}
SMTP_PASSWORD: {{ required "Must specify SMTP password" .Values.vaultwarden.smtp.password | b64enc | quote }} SMTP_PASSWORD: {{ required "Must specify SMTP password" .Values.vaultwarden.smtp.password | quote }}
{{- end }} {{- end }}
{{- if ne $yubicoClientId "" }} {{- if ne $yubicoClientId "" }}
YUBICO_CLIENT_ID: {{ $yubicoClientId }} YUBICO_CLIENT_ID: {{ $yubicoClientId }}
YUBICO_SECRET_KEY: {{ required "Yubico Secret Key required" .Values.vaultwarden.yubico.secretKey | b64enc | quote }} YUBICO_SECRET_KEY: {{ required "Yubico Secret Key required" .Values.vaultwarden.yubico.secretKey | quote }}
{{- end }} {{- end }}
{{- end -}} {{- end -}}