From 71d1178665c28529472d4e10f3dc3bbe928de2e8 Mon Sep 17 00:00:00 2001
From: Ruben Hensen <ruben.hensen@protonmail.com>
Date: Mon, 26 Jan 2026 22:31:47 +0100
Subject: [PATCH] Move ssl require

---
 sogo/templates/_helpers.tpl   |  2 +-
 sogo/templates/configmap.yaml | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/sogo/templates/_helpers.tpl b/sogo/templates/_helpers.tpl
index d13892f..e8d3bc7 100644
--- a/sogo/templates/_helpers.tpl
+++ b/sogo/templates/_helpers.tpl
@@ -56,5 +56,5 @@ PostgreSQL connection URL base (without table name)
 {{- $host := printf "%s-postgres-rw.%s.svc.cluster.local" (include "sogo.fullname" .) .Release.Namespace -}}
 {{- $port := "5432" -}}
 {{- $db := .Values.postgresql.database -}}
-{{- printf "postgresql://%s:${POSTGRES_PASSWORD}@%s:%s/%s" $user $host $port $db -}}
+{{- printf "postgresql://%s:${POSTGRES_PASSWORD}@%s:%s/%s?sslmode=require" $user $host $port $db -}}
 {{- end }}
diff --git a/sogo/templates/configmap.yaml b/sogo/templates/configmap.yaml
index dbce691..8993865 100644
--- a/sogo/templates/configmap.yaml
+++ b/sogo/templates/configmap.yaml
@@ -6,12 +6,12 @@ metadata:
     {{- include "sogo.labels" . | nindent 4 }}
 data:
   01-database.yaml: |
-    OCSFolderInfoURL: {{ include "sogo.postgresqlURL" . }}/sogo_folder_info?sslmode=require
-    OCSSessionsFolderURL: {{ include "sogo.postgresqlURL" . }}/sogo_sessions_folder?sslmode=require
-    OCSEMailAlarmsFolderURL: {{ include "sogo.postgresqlURL" . }}/sogo_alarms_folder?sslmode=require
-    OCSStoreURL: {{ include "sogo.postgresqlURL" . }}/sogo_store?sslmode=require
-    OCSAclURL: {{ include "sogo.postgresqlURL" . }}/sogo_acl?sslmode=require
-    OCSCacheFolderURL: {{ include "sogo.postgresqlURL" . }}/sogo_cache_folder?sslmode=require
+    OCSFolderInfoURL: {{ include "sogo.postgresqlURL" . }}/sogo_folder_info
+    OCSSessionsFolderURL: {{ include "sogo.postgresqlURL" . }}/sogo_sessions_folder
+    OCSEMailAlarmsFolderURL: {{ include "sogo.postgresqlURL" . }}/sogo_alarms_folder
+    OCSStoreURL: {{ include "sogo.postgresqlURL" . }}/sogo_store
+    OCSAclURL: {{ include "sogo.postgresqlURL" . }}/sogo_acl
+    OCSCacheFolderURL: {{ include "sogo.postgresqlURL" . }}/sogo_cache_folder
 
   02-mail.yaml: |
     SOGoIMAPServer: {{ .Values.config.mail.imapServer }}
@@ -30,11 +30,11 @@ data:
     SOGoLanguage: {{ .Values.config.language }}
     SOGoTimeZone: {{ .Values.config.timezone }}
     SOGoSuperUsername: {{ .Values.config.adminUser }}
-    SOGoProfileURL: {{ include "sogo.postgresqlURL" . }}/sogo_user_profile?sslmode=require
+    SOGoProfileURL: {{ include "sogo.postgresqlURL" . }}/sogo_user_profile
     SOGoUserSources:
       - type: sql
         id: users
-        viewURL: {{ include "sogo.postgresqlURL" . }}/sogo_view?sslmode=require
+        viewURL: {{ include "sogo.postgresqlURL" . }}/sogo_view
         canAuthenticate: YES
         isAddressBook: YES
         userPasswordAlgorithm: none