From bd4c997950750e36168434e82daf48f20d0a42df Mon Sep 17 00:00:00 2001 From: Thomas Kaltenbrunner Date: Mon, 18 Aug 2025 12:26:54 +0200 Subject: [PATCH] fix(helmfile): When optional mail domain is set, use it as sender domain for system generated (noreply) mails --- helmfile/apps/element/values-synapse.yaml.gotmpl | 2 +- helmfile/apps/nextcloud/values-nextcloud-management.yaml.gotmpl | 2 +- helmfile/apps/notes/values.yaml.gotmpl | 2 +- helmfile/apps/nubus/values-nubus.yaml.gotmpl | 2 +- helmfile/apps/open-xchange/values-openxchange.yaml.gotmpl | 2 +- helmfile/apps/openproject/values.yaml.gotmpl | 2 +- helmfile/apps/xwiki/values.yaml.gotmpl | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/helmfile/apps/element/values-synapse.yaml.gotmpl b/helmfile/apps/element/values-synapse.yaml.gotmpl index a807ea84..f914e196 100644 --- a/helmfile/apps/element/values-synapse.yaml.gotmpl +++ b/helmfile/apps/element/values-synapse.yaml.gotmpl @@ -132,7 +132,7 @@ configuration: allowUsersToUpdateDisplayname: {{ .Values.functional.chat.matrix.profile.allowUsersToUpdateDisplayname }} smtp: - senderAddress: "{{ .Values.smtp.localpartNoReply }}@{{ .Values.global.domain }}" + senderAddress: "{{ .Values.smtp.localpartNoReply }}@{{ .Values.global.mailDomain | default .Values.global.domain }}" host: {{ printf "%s.%s.svc.%s" "postfix" (.Values.apps.postfix.namespace | default .Release.Namespace) .Values.cluster.networking.domain | quote }} port: 25 tls: false diff --git a/helmfile/apps/nextcloud/values-nextcloud-management.yaml.gotmpl b/helmfile/apps/nextcloud/values-nextcloud-management.yaml.gotmpl index 50b87edc..666b2f5e 100644 --- a/helmfile/apps/nextcloud/values-nextcloud-management.yaml.gotmpl +++ b/helmfile/apps/nextcloud/values-nextcloud-management.yaml.gotmpl @@ -161,7 +161,7 @@ configuration: host: {{ printf "%s.%s.svc.%s" "postfix" (.Values.apps.postfix.namespace | default .Release.Namespace) .Values.cluster.networking.domain | quote }} port: 587 fromAddress: {{ .Values.smtp.localpartNoReply | quote }} - mailDomain: "{{ .Values.global.domain }}" + mailDomain: "{{ .Values.global.mailDomain | default .Values.global.domain }}" security: "tls" skipVerifyPeer: true diff --git a/helmfile/apps/notes/values.yaml.gotmpl b/helmfile/apps/notes/values.yaml.gotmpl index 5ca5bcf6..c25a2a29 100644 --- a/helmfile/apps/notes/values.yaml.gotmpl +++ b/helmfile/apps/notes/values.yaml.gotmpl @@ -58,7 +58,7 @@ backend: value: {{ .Values.databases.notes.username | quote }} email: brandName: "openDesk" - from: "{{ .Values.smtp.localpartNoReply }}@{{ .Values.global.domain }}" + from: "{{ .Values.smtp.localpartNoReply }}@{{ .Values.global.mailDomain | default .Values.global.domain }}" host: "postfix" port: "25" logoImage: {{ printf "https://%s.%s/univention/portal/icons/entries/swp.notes.svg" .Values.global.hosts.nubus .Values.global.domain | quote }} diff --git a/helmfile/apps/nubus/values-nubus.yaml.gotmpl b/helmfile/apps/nubus/values-nubus.yaml.gotmpl index edeb2c2a..7c1a9c1e 100644 --- a/helmfile/apps/nubus/values-nubus.yaml.gotmpl +++ b/helmfile/apps/nubus/values-nubus.yaml.gotmpl @@ -550,7 +550,7 @@ nubusKeycloakExtensions: newDeviceLoginNotificationEnable: {{ if .Values.functional.authentication.newDeviceLoginNotification.enabled }}"True"{{ else }}"False"{{ end }} logLevel: {{ if .Values.debug.enabled }}"DEBUG"{{ else }}"WARN"{{ end }} newDeviceLoginSubject: "New device login on your {{ .Values.theme.texts.productName }} account" - mailFrom: "{{ .Values.smtp.localpartNoReply }}@{{ .Values.global.domain }}" + mailFrom: "{{ .Values.smtp.localpartNoReply }}@{{ .Values.global.mailDomain | default .Values.global.domain }}" image: registry: {{ coalesce .Values.repositories.image.registryOpencodeDe .Values.global.imageRegistry .Values.images.nubusKeycloakExtensionHandler.registry | quote }} repository: {{ .Values.images.nubusKeycloakExtensionHandler.repository }} diff --git a/helmfile/apps/open-xchange/values-openxchange.yaml.gotmpl b/helmfile/apps/open-xchange/values-openxchange.yaml.gotmpl index 583f902d..dbfaa3cd 100644 --- a/helmfile/apps/open-xchange/values-openxchange.yaml.gotmpl +++ b/helmfile/apps/open-xchange/values-openxchange.yaml.gotmpl @@ -570,7 +570,7 @@ appsuite: bindDNPassword: {{ .Values.secrets.nubus.ldapSearch.ox | quote }} bindOnly: "false" /opt/open-xchange/etc/noreply.properties: - com.openexchange.noreply.address: "{{ .Values.smtp.localpartNoReply }}@{{ .Values.global.domain }}" + com.openexchange.noreply.address: "{{ .Values.smtp.localpartNoReply }}@{{ .Values.global.mailDomain | default .Values.global.domain }}" com.openexchange.noreply.login: {{ printf "%s@%s" "opendesk-system" ( .Values.global.mailDomain | default .Values.global.domain ) }} com.openexchange.noreply.password: {{ .Values.secrets.postfix.opendeskSystemPassword | quote }} com.openexchange.noreply.server: "postfix" diff --git a/helmfile/apps/openproject/values.yaml.gotmpl b/helmfile/apps/openproject/values.yaml.gotmpl index 2f5f5ee6..b8d00412 100644 --- a/helmfile/apps/openproject/values.yaml.gotmpl +++ b/helmfile/apps/openproject/values.yaml.gotmpl @@ -82,7 +82,7 @@ environment: OPENPROJECT_SMTP__AUTHENTICATION: "cram_md5" OPENPROJECT_SMTP__ENABLE__STARTTLS__AUTO: "true" OPENPROJECT_SMTP__OPENSSL__VERIFY__MODE: "none" - OPENPROJECT_MAIL__FROM: "{{ .Values.smtp.localpartNoReply }}@{{ .Values.global.domain }}" + OPENPROJECT_MAIL__FROM: "{{ .Values.smtp.localpartNoReply }}@{{ .Values.global.mailDomain | default .Values.global.domain }}" OPENPROJECT_HOME__URL: {{ printf "https://%s.%s/" .Values.global.hosts.nubus .Values.global.domain | quote }} OPENPROJECT_OPENID__CONNECT_KEYCLOAK_ISSUER: "https://{{ .Values.global.hosts.keycloak }}.{{ .Values.global.domain }}/realms/{{ .Values.platform.realm }}" OPENPROJECT_OPENID__CONNECT_KEYCLOAK_POST__LOGOUT__REDIRECT__URI: "https://{{ .Values.global.hosts.openproject }}.{{ .Values.global.domain }}/" diff --git a/helmfile/apps/xwiki/values.yaml.gotmpl b/helmfile/apps/xwiki/values.yaml.gotmpl index 9c4bcad6..6a674165 100644 --- a/helmfile/apps/xwiki/values.yaml.gotmpl +++ b/helmfile/apps/xwiki/values.yaml.gotmpl @@ -172,7 +172,7 @@ properties: # therefore on XWiki restart an LDAP sync is triggered to load the dynamic mapping. "property:xwiki:XWiki.XWikiPreferences^XWiki.XWikiPreferences.ldap_group_mapping": "xwiki:XWiki.XWikiAdminGroup=cn=managed-by-attribute-KnowledgemanagementAdmin,cn=groups,{{ .Values.ldap.baseDn }}" ## SMTP settings - "property:xwiki:Mail.MailConfig^Mail.SendMailConfigClass.from": "{{ .Values.smtp.localpartNoReply }}@{{ .Values.global.domain }}" + "property:xwiki:Mail.MailConfig^Mail.SendMailConfigClass.from": "{{ .Values.smtp.localpartNoReply }}@{{ .Values.global.mailDomain | default .Values.global.domain }}" "property:xwiki:Mail.MailConfig^Mail.SendMailConfigClass.host": {{ printf "%s.%s.svc.%s" "postfix" (.Values.apps.postfix.namespace | default .Release.Namespace) .Values.cluster.networking.domain | quote }} "property:xwiki:Mail.MailConfig^Mail.SendMailConfigClass.port": 587 "property:xwiki:Mail.MailConfig^Mail.SendMailConfigClass.properties": "mail.smtp.starttls.enable=true"