From 281dc44f60fb07579fb46f63110efb9f24a9dbe8 Mon Sep 17 00:00:00 2001 From: Hamza Imran Saeed Date: Thu, 7 Dec 2023 19:40:28 +0100 Subject: [PATCH] update email settings --- scaleout/stackn/templates/basic-secrets.yaml | 2 +- .../stackn/templates/studio-deployment.yaml | 2 +- .../templates/studio-settings-configmap.yaml | 19 +++++++++++++------ 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/scaleout/stackn/templates/basic-secrets.yaml b/scaleout/stackn/templates/basic-secrets.yaml index 4e9a0fc..2756777 100644 --- a/scaleout/stackn/templates/basic-secrets.yaml +++ b/scaleout/stackn/templates/basic-secrets.yaml @@ -16,4 +16,4 @@ data: email-host-password: {{ .Values.studio.emailService.hostPassword | b64enc }} email-api-key: {{ .Values.studio.emailService.apiKey | b64enc }} {{ end }} -{{- end -}} \ No newline at end of file +{{- end -}} diff --git a/scaleout/stackn/templates/studio-deployment.yaml b/scaleout/stackn/templates/studio-deployment.yaml index 92e3bf2..ea3524a 100644 --- a/scaleout/stackn/templates/studio-deployment.yaml +++ b/scaleout/stackn/templates/studio-deployment.yaml @@ -115,7 +115,7 @@ spec: secretKeyRef: name: {{ include "stackn.secretName" . }} key: email-host-user - - name: EMAIL_HOST_PASSWORD + - name: EMAIL_PASSWORD valueFrom: secretKeyRef: name: {{ include "stackn.secretName" . }} diff --git a/scaleout/stackn/templates/studio-settings-configmap.yaml b/scaleout/stackn/templates/studio-settings-configmap.yaml index b099beb..92728b7 100644 --- a/scaleout/stackn/templates/studio-settings-configmap.yaml +++ b/scaleout/stackn/templates/studio-settings-configmap.yaml @@ -321,18 +321,25 @@ data: CSRF_TRUSTED_ORIGINS = ['https://*{{ .Values.session_cookie_domain }}','https://*.127.0.0.1'] + [{{ .Values.studio.csrf_trusted_origins | quote}}] # Email + EMAIL_BACKEND = ( + "django.core.mail.backends.smtp.EmailBackend" if not DEBUG else "django.core.mail.backends.console.EmailBackend" + ) {{ if .Values.studio.emailService.enabled }} EMAIL_HOST = {{ .Values.studio.emailService.host | quote}} EMAIL_PORT = {{ .Values.studio.emailService.port }} EMAIL_HOST_USER = os.environ["EMAIL_HOST_USER"] EMAIL_HOST_PASSWORD = os.environ["EMAIL_HOST_PASSWORD"] + {{ if .Values.studio.emailService.ssl }} + EMAIL_USE_TLS = False + EMAIL_USE_SSL = True + {{ else }} EMAIL_USE_TLS = True - - EMAIL_DOMAIN_NAME = {{ .Values.studio.emailService.domainName | quote}} - EMAIL_API_KEY = os.environ["EMAIL_API_KEY"] - EMAIL_MAILGUN_API = {{ .Values.studio.emailService.apiEndpoint | quote}} - EMAIL_NOTIFY_ON_ACCOUNT_REGISTER_LIST = [{{- range .Values.studio.emailService.notifyOnAccountRegisterList }}{{. | quote }},{{- end }}] - DEFAULT_FROM_EMAIL = {{ .Values.studio.emailService.smtpEmailFrom | quote}} + {{ end }} + # EMAIL_DOMAIN_NAME = {{ .Values.studio.emailService.domainName | quote}} + # EMAIL_API_KEY = os.environ["EMAIL_API_KEY"] + # EMAIL_MAILGUN_API = {{ .Values.studio.emailService.apiEndpoint | quote}} + # EMAIL_NOTIFY_ON_ACCOUNT_REGISTER_LIST = [{{- range .Values.studio.emailService.notifyOnAccountRegisterList }}{{. | quote }},{{- end }}] + # DEFAULT_FROM_EMAIL = {{ .Values.studio.emailService.smtpEmailFrom | quote}} {{ else }} EMAIL_BACKEND = "django.core.mail.backends.filebased.EmailBackend" EMAIL_FILE_PATH = os.path.join(BASE_DIR, 'sent_emails')