From 3c50802ba74369cf6dbdea00d5265a3f595678d0 Mon Sep 17 00:00:00 2001
From: Ruben Hensen <ruben.hensen@protonmail.com>
Date: Tue, 27 Jan 2026 13:53:25 +0100
Subject: [PATCH] Change es

---
 sogo/external-secret.yaml    | 15 ++++++++-------
 sogo/sogo-config-secret.yaml | 15 +++++----------
 2 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/sogo/external-secret.yaml b/sogo/external-secret.yaml
index 24e2606..5579afe 100644
--- a/sogo/external-secret.yaml
+++ b/sogo/external-secret.yaml
@@ -11,12 +11,13 @@ spec:
   target:
     name: sogo-postgres-credentials
     creationPolicy: Owner
-    template:
-      engineVersion: v2
-      data:
-        username: "{{ `{{ .postgres_user }}` }}"
-        password: "{{ `{{ .postgres_pw }}` }}"
-  dataFrom:
-  - extract:
+  data:
+  - secretKey: username
+    remoteRef:
       key: kv/sogo
+      property: postgres_user
+  - secretKey: password
+    remoteRef:
+      key: kv/sogo
+      property: postgres_pw
 
diff --git a/sogo/sogo-config-secret.yaml b/sogo/sogo-config-secret.yaml
index bd27e32..eb147d8 100644
--- a/sogo/sogo-config-secret.yaml
+++ b/sogo/sogo-config-secret.yaml
@@ -20,17 +20,12 @@ spec:
         OCSStoreURL: "postgresql://{{ .postgres_user }}:{{ .postgres_pw }}@sogo-postgres-rw:5432/sogo/sogo_store?sslmode=require"
         OCSAclURL: "postgresql://{{ .postgres_user }}:{{ .postgres_pw }}@sogo-postgres-rw:5432/sogo/sogo_acl?sslmode=require"
         SOGoUserSources__yaml: |
-          - type: imap
-            id: stalwart
-            canAuthenticate: YES
+          - type: sql
+            id: directory
+            viewURL: "postgresql://{{ .postgres_user }}:{{ .postgres_pw }}@sogo-postgres-rw:5432/sogo/sogo_users"
+            canAuthenticate: NO
             isAddressBook: NO
-            displayName: "Stalwart Mail"
-            hostname: "stalwart.stalwart.svc.cluster.local"
-            port: 993
-            encryption: tls
-            loginFieldNames:
-              - mail
-              - cn
+            userPasswordAlgorithm: none
         SOGoIMAPServer: "imaps://stalwart.stalwart.svc.cluster.local:993"
         SOGoSieveServer: "sieve://stalwart.stalwart.svc.cluster.local:4190"
         SOGoSMTPServer: "stalwart.stalwart.svc.cluster.local"