From 275ea6d4ab4c75c4137cf6c1095b4a6c62ea3554 Mon Sep 17 00:00:00 2001
From: root <root@f11391a1.federatedcomputer.cloud>
Date: Thu, 19 Sep 2024 13:39:14 +0000
Subject: [PATCH] Updated mail.sh to 14.0 and latest-versions

---
 lib/latest-versions | 2 +-
 lib/mail.sh         | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/latest-versions b/lib/latest-versions
index 8236b96..9e1f956 100644
--- a/lib/latest-versions
+++ b/lib/latest-versions
@@ -13,7 +13,7 @@ listmonk=v2.4.0
 panel=v1.11
 vaultwarden=1.28.1
 matrix=v1.100.0
-mail=12.1
+mail=14.0
 ldap=1.5.0
 wireguard=1.0.20210914
 gitea=1.19.0
diff --git a/lib/mail.sh b/lib/mail.sh
index 03dee17..d023038 100644
--- a/lib/mail.sh
+++ b/lib/mail.sh
@@ -56,7 +56,7 @@ EOF
 LDAP_SECRET=`cat /federated/apps/ldap/.ldap.secret`
 
 cat > /federated/apps/mail/.env <<EOF
-IMAGE_VERSION="12.1"
+IMAGE_VERSION="14.0"
 ENABLE_SPAMASSASSIN=1
 ENABLE_SPAMASSASSIN_KAM=1
 SPAMASSASSIN_SPAM_TO_INBOX=1
@@ -68,14 +68,14 @@ ENBALE_OPENDMARC=1
 ONE_DIR=1
 DMS_DEBUG=0
 LOG_LEVEL=debug
-ENABLE_LDAP=1
+ACCOUNT_PROVISIONER=LDAP
 SSL_TYPE=manual
 SSL_CERT_PATH=/root/certs/$DOMAIN.crt
 SSL_KEY_PATH=/root/certs/$DOMAIN.key
 LDAP_START_TLS=yes
 DOVECOT_TLS=yes
 SASLAUTHD_LDAP_START_TLS=yes
-LDAP_SERVER_HOST=ldap.$DOMAIN
+LDAP_SERVER_HOST=ldap://ldap.$DOMAIN
 LDAP_SEARCH_BASE=ou=people,dc=federatedcomputer,dc=cloud
 LDAP_BIND_DN=cn=admin,dc=federatedcomputer,dc=cloud
 LDAP_BIND_PW=$LDAP_SECRET
@@ -90,7 +90,7 @@ DOVECOT_USER_ATTRS=homeDirectory=home,=uid=5000,=gid=5000
 # SASLAUTHD
 ENABLE_SASLAUTHD=1
 SASLAUTHD_MECHANISMS=ldap
-SASLAUTHD_LDAP_SERVER=ldap.$DOMAIN
+SASLAUTHD_LDAP_SERVER=ldap://ldap.$DOMAIN
 SASLAUTHD_LDAP_BIND_DN=cn=admin,dc=federatedcomputer,dc=cloud
 SASLAUTHD_LDAP_PASSWORD=$LDAP_SECRET
 SASLAUTHD_LDAP_SEARCH_BASE=ou=people,dc=federatedcomputer,dc=cloud