From f4a271a72059fa84502572f779d63e0871e3cae6 Mon Sep 17 00:00:00 2001
From: lolcat <will@lolcat.ca>
Date: Sat, 9 Aug 2025 19:36:54 -0400
Subject: [PATCH] debian 13 support

---
 README.md           |  3 +++
 script/dovecot.conf | 49 +++++++++++++++++++++++++++------------------
 script/main.cf      |  2 +-
 3 files changed, 33 insertions(+), 21 deletions(-)

diff --git a/README.md b/README.md
index 0420c13..894635b 100644
--- a/README.md
+++ b/README.md
@@ -2,6 +2,9 @@
 
 BullMail is a no-bullshit solution to setup an E-Mail server on a Debian/Ubuntu shitbox.
 
+## Now updated to work with Debian 13 Trixie
+If you ran this script before, simply run it again. Just a heads up, it will generate new DKIM keys. I recommend you generate new ones otherwise this shit might break.
+
 ## What it does
 - Creates an `SMTP` server (`postfix`, to send and receive E-Mails)
 - Creates an `IMAP` server (`dovecot`, to check your E-Mails)
diff --git a/script/dovecot.conf b/script/dovecot.conf
index d25961f..fc63ef4 100644
--- a/script/dovecot.conf
+++ b/script/dovecot.conf
@@ -1,19 +1,24 @@
 #logging
+
+dovecot_config_version = 2.4.1
+dovecot_storage_version = 2.4.1
+auth_mechanisms = plain login
+auth_username_format = %{user | username | lower }
+
 #auth_verbose = yes
 #auth_debug = yes
 #mail_debug = yes
 #log_path = /var/log/dovecot.log
 
-disable_plaintext_auth = no
-auth_mechanisms = plain login
-auth_username_format = %Ln
-
-ssl = yes
-ssl_cert = <KEY.pem
-ssl_key = <KEY.key
-ssl_client_ca_dir = /etc/ssl/certs
-ssl_dh = </usr/share/dovecot/dh.pem
-ssl_min_protocol = TLSv1.1
+protocol imap {
+  ssl = yes
+  auth_allow_cleartext = yes
+  ssl_server_cert_file = KEY.pem
+  ssl_server_key_file = KEY.key
+  #ssl_client_ca_dir = /etc/ssl/certs
+  #ssl_dh = </usr/share/dovecot/dh.pem
+  ssl_min_protocol = TLSv1.1
+}
 
 service imap-login {
   inet_listener imap {
@@ -40,13 +45,16 @@ service auth {
   }
 }
 
-mail_location = maildir:~/Maildir
+mail_driver = maildir
+mail_path = ~/Maildir
+mailbox_list_layout = fs
+
 mail_privileged_group = mail
 managesieve_notify_capability = mailto
 managesieve_sieve_capability = fileinto reject envelope encoded-character vacation subaddress comparator-i;ascii-numeric relational regex imap4flags copy include variables body enotify environment mailbox date index ihave duplicate mime foreverypart extracttext
 namespace inbox {
   inbox = yes
-  location = maildir:~/Maildir
+  mail_path = ~/Maildir
   prefix =
   
   mailbox Drafts {
@@ -67,28 +75,29 @@ namespace inbox {
   }
 }
 
-passdb {
+passdb pam {
   driver = pam
 }
-userdb {
+userdb passwd {
   driver = passwd
 }
 
-
-plugin {
-  sieve_global_path = /etc/dovecot/sieve/spam2junk.sieve
+sieve_script spam2junk {
+  path = /etc/dovecot/sieve/spam2junk.sieve
   #sieve_global_dir = /etc/dovecot/sieve/
   #sieve = file:~/sieve;active=~/.dovecot.sieve
 }
 protocol lmtp {
-  mail_plugins = $mail_plugins sieve
+  mail_plugins = sieve
   postmaster_address = postmaster@__domain__
   mail_fsync = optimized
 }
+
 protocol lda {
-  mail_plugins = $mail_plugins sieve
+  mail_plugins = sieve
 }
-service lmtp {
+
+service lmtp { 
   unix_listener /var/spool/postfix/private/dovecot-lmtp {
     group = postfix
     mode = 0600
diff --git a/script/main.cf b/script/main.cf
index 5a9989a..907e1fe 100644
--- a/script/main.cf
+++ b/script/main.cf
@@ -26,7 +26,7 @@ smtpd_sasl_security_options = noanonymous
 smtpd_sasl_local_domain = __hostname__
 smtpd_recipient_restrictions = permit_mynetworks, permit_sasl_authenticated, reject_unauth_destination
 
-virtual_transport = dovecot
+virtual_transport = lmtp:unix:private/dovecot-lmtp
 local_transport = lmtp:unix:private/dovecot-lmtp
 dovecot_destination_recipient_limit = 1