From a61d00482f9942a32e608bc559c5f2910416a000 Mon Sep 17 00:00:00 2001
From: Thomas Kintscher <thomas.kintscher.extern@univention.de>
Date: Wed, 22 Nov 2023 15:56:54 +0100
Subject: [PATCH] chore(univention-management-stack): Move static values of
 stack-data-swp to yaml file

---
 helmfile/apps/keycloak/values-extensions.gotmpl    |  1 +
 helmfile/apps/nextcloud/values-bootstrap.gotmpl    |  1 +
 helmfile/apps/services/values-postfix.gotmpl       |  2 +-
 .../apps/univention-management-stack/helmfile.yaml |  1 +
 .../values-stack-data-swp.gotmpl                   |  9 +--------
 .../values-stack-data-swp.yaml                     | 14 ++++++++++++++
 6 files changed, 19 insertions(+), 9 deletions(-)
 create mode 100644 helmfile/apps/univention-management-stack/values-stack-data-swp.yaml

diff --git a/helmfile/apps/keycloak/values-extensions.gotmpl b/helmfile/apps/keycloak/values-extensions.gotmpl
index 5fb1cf76..ca522e68 100644
--- a/helmfile/apps/keycloak/values-extensions.gotmpl
+++ b/helmfile/apps/keycloak/values-extensions.gotmpl
@@ -23,6 +23,7 @@ handler:
   appConfig:
     smtpPassword: {{ .Values.smtp.password | quote }}
     smtpHost: {{ .Values.smtp.host | quote }}
+    smtpPort: {{ .Values.smtp.port | quote }}
     smtpUsername: {{ .Values.smtp.username | quote }}
     mailFrom: "noreply@{{ .Values.global.domain }}"
   resources:
diff --git a/helmfile/apps/nextcloud/values-bootstrap.gotmpl b/helmfile/apps/nextcloud/values-bootstrap.gotmpl
index fdd11ec4..3de9c073 100644
--- a/helmfile/apps/nextcloud/values-bootstrap.gotmpl
+++ b/helmfile/apps/nextcloud/values-bootstrap.gotmpl
@@ -44,6 +44,7 @@ config:
 
   smtp:
     host: {{ .Values.smtp.host | quote }}
+    port: {{ .Values.smtp.port | quote }}
     username: {{ .Values.smtp.username | quote }}
     password: {{ .Values.smtp.password | quote }}
 
diff --git a/helmfile/apps/services/values-postfix.gotmpl b/helmfile/apps/services/values-postfix.gotmpl
index ff2b1391..3287bcf5 100644
--- a/helmfile/apps/services/values-postfix.gotmpl
+++ b/helmfile/apps/services/values-postfix.gotmpl
@@ -24,7 +24,7 @@ postfix:
     - fileName: "sasl_passwd.map"
       content:
         - {{ printf "%s %s:%s" .Values.smtp.host .Values.smtp.username .Values.smtp.password | quote }}
-  relayHost: {{ printf "[%s]:587" .Values.smtp.host | quote }}
+  relayHost: {{ printf "[%s]:[%d]" .Values.smtp.host .Values.smtp.port | quote }}
   relayNets: {{ .Values.cluster.networking.cidr | quote}}
   virtualTransport: "lmtps:dovecot:24"
   smtpdSASLPath: "inet:dovecot:3659"
diff --git a/helmfile/apps/univention-management-stack/helmfile.yaml b/helmfile/apps/univention-management-stack/helmfile.yaml
index 7007cbc0..0f4e5e24 100644
--- a/helmfile/apps/univention-management-stack/helmfile.yaml
+++ b/helmfile/apps/univention-management-stack/helmfile.yaml
@@ -123,6 +123,7 @@ releases:
       - "values-common.gotmpl"
       - "values-common.yaml"
       - "values-stack-data-swp.gotmpl"
+      - "values-stack-data-swp.yaml"
     installed: {{ .Values.univentionManagementStack.enabled }}
 
   # renovate:
diff --git a/helmfile/apps/univention-management-stack/values-stack-data-swp.gotmpl b/helmfile/apps/univention-management-stack/values-stack-data-swp.gotmpl
index 366caf79..c6122dbb 100644
--- a/helmfile/apps/univention-management-stack/values-stack-data-swp.gotmpl
+++ b/helmfile/apps/univention-management-stack/values-stack-data-swp.gotmpl
@@ -4,13 +4,9 @@ SPDX-License-Identifier: Apache-2.0
 */}}
 ---
 stackDataSwp:
-  udmApiUser: "cn=admin"
   udmApiPassword: {{ .Values.secrets.univentionManagementStack.ldapSecret | quote }}
-  udmApiUrl: "http://ums-udm-rest-api/udm/"
-  loadDevData: true
 
 stackDataContext:
-  ldapBase: "dc=swp-ldap,dc=internal"
   ldapSearchUsers:
     {{- range $k, $v := .Values.secrets.univentionCorporateServer.ldapSearch }}
     - username: {{ printf "ldapsearch_%s" $k | quote }}
@@ -29,11 +25,8 @@ stackDataContext:
   portalManagementKnowledgeLinkBase: "https://{{ .Values.global.hosts.xwiki }}.{{ .Values.global.domain }}"
 
   smtpHost: {{ .Values.smtp.host | quote }}
-  smtpPort: 587
+  smtpPort: {{ .Values.smtp.port | quote }}
   smtpUser: {{ .Values.smtp.username | quote }}
-  smtpStartTls: true
-
-  oxDefaultContext: "10"
 
   userPassword: {{ .Values.secrets.univentionManagementStack.defaultAccounts.userPassword | quote }}
   adminPassword: {{ .Values.secrets.univentionManagementStack.defaultAccounts.adminPassword | quote }}
diff --git a/helmfile/apps/univention-management-stack/values-stack-data-swp.yaml b/helmfile/apps/univention-management-stack/values-stack-data-swp.yaml
new file mode 100644
index 00000000..2c755350
--- /dev/null
+++ b/helmfile/apps/univention-management-stack/values-stack-data-swp.yaml
@@ -0,0 +1,14 @@
+# SPDX-FileCopyrightText: 2023 Bundesministerium des Innern und für Heimat, PG ZenDiS "Projektgruppe für Aufbau ZenDiS"
+# SPDX-License-Identifier: Apache-2.0
+---
+stackDataSwp:
+  udmApiUser: "cn=admin"
+  udmApiUrl: "http://ums-udm-rest-api/udm/"
+  loadDevData: true
+
+stackDataContext:
+  ldapBase: "dc=swp-ldap,dc=internal"
+  oxDefaultContext: "10"
+  smtpStartTls: true
+
+...