From a79e40f44af68a16f0944265cc447ec9b0d84922 Mon Sep 17 00:00:00 2001
From: Philip Gaber <gaber@b1-systems.de>
Date: Wed, 9 Jul 2025 11:44:46 +0200
Subject: [PATCH] fix(dovecot-pro): Use of `requiredEnv` instead of `env` and
 update `README-EE.md`

---
 README-EE.md                                          | 11 +++++++++++
 .../values-dovecot-enterprise.yaml.gotmpl             |  4 ++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/README-EE.md b/README-EE.md
index 26853f49..58a94a34 100644
--- a/README-EE.md
+++ b/README-EE.md
@@ -150,3 +150,14 @@ openDesk updates OX App Suite in od CE and EE always to the same release version
 - Dovecot Pro container image: Dovecot Pro is based on the open source components Dovecot and Pigeonhole but extended by modules providing additional functionality like obox2, cluster, cluster controller and dovecot fts. The additional modules make up about 15% of the overall Dovecot Pro code and are subject to a closed source license.
 
 openDesk aims to keep Dovecot's shared codebases in sync between oD CE and EE, though the versioning between the releases differs (CE: 2.x, EE: 3.y).
+
+Dovecot Pro requires two additional environment variables:
+
+- `DOVECOT_CRYPT_PRIVATE_KEY`
+- `DOVECOT_CRYPT_PUBLIC_KEY`
+
+These variables must contain the base64 encoded strings of the private and public
+key. These keys can be generated with the following commands:
+
+- Private Key: `openssl genpkey -algorithm X25519 -out private.pem && cat private.pem | base64 -w0`
+- Public Key: `openssl pkey -in private.pem -out public.pem -pubout && cat public.pem | base64 -w0`
diff --git a/helmfile/apps/open-xchange/values-dovecot-enterprise.yaml.gotmpl b/helmfile/apps/open-xchange/values-dovecot-enterprise.yaml.gotmpl
index 00e4db7e..3643910f 100644
--- a/helmfile/apps/open-xchange/values-dovecot-enterprise.yaml.gotmpl
+++ b/helmfile/apps/open-xchange/values-dovecot-enterprise.yaml.gotmpl
@@ -37,9 +37,9 @@ dovecot:
     bucket: {{ .Values.objectstores.dovecot.bucket | quote }}
     encryption:
       privateKey:
-        value: {{ env "DOVECOT_CRYPT_PRIVATE_KEY" | quote }}
+        value: {{ requiredEnv "DOVECOT_CRYPT_PRIVATE_KEY" | quote }}
       publicKey:
-        value: {{ env "DOVECOT_CRYPT_PUBLIC_KEY" | quote }}
+        value: {{ requiredEnv "DOVECOT_CRYPT_PUBLIC_KEY" | quote }}
     fqdn: {{ .Values.objectstores.dovecot.endpoint | default (printf "%s.%s" .Values.global.hosts.minioApi .Values.global.domain) | quote }}
     username: {{ .Values.objectstores.dovecot.username | quote }}
     password: