From 3b63b664723270b0999fe43239c407f96e7a10c3 Mon Sep 17 00:00:00 2001
From: Andreas Knuth <andreas.knuth@gmail.com>
Date: Sun, 23 Mar 2025 19:50:18 +0100
Subject: [PATCH] dovecot 2.4

---
 dovecot/config/doveconf24.conf | 55 ++++++++++++++++++++++++++++++++++
 dovecot/docker-compose24.yml   | 24 +++++++++++++++
 2 files changed, 79 insertions(+)
 create mode 100644 dovecot/config/doveconf24.conf
 create mode 100644 dovecot/docker-compose24.yml

diff --git a/dovecot/config/doveconf24.conf b/dovecot/config/doveconf24.conf
new file mode 100644
index 0000000..0de1f45
--- /dev/null
+++ b/dovecot/config/doveconf24.conf
@@ -0,0 +1,55 @@
+# Dovecot 2.4.x Konfiguration
+# Protokolle (korrigiert zurück zu 'imap')
+protocols = imap pop3
+
+# Logging (Block-Syntax)
+log {
+  path = /var/log/dovecot.log
+}
+log {
+  path = /var/log/dovecot-info.log
+  level = info
+}
+log {
+  path = /var/log/dovecot-debug.log
+  level = debug
+}
+
+# Mail-Location
+mail_location = maildir:/var/mail/%d/%n
+
+# Authentifizierung
+auth_mechanisms = plain login
+disable_plaintext_auth = no
+
+# Passwd-Datenbank (mit Namen und korrekter Syntax)
+passdb passwd-file {
+  driver = passwd-file
+  args = username_format=%u password_hash=plaintext /etc/dovecot/passwd
+}
+
+userdb passwd-file {
+  driver = passwd-file
+  args = username_format=%u uid=vmail gid=vmail /etc/dovecot/passwd
+}
+
+# Mail-Berechtigungen (nicht mehr in Service-Blöcken nötig)
+# uid/gid jetzt direkt in userdb definiert
+
+# SSL-Einstellungen
+ssl = yes
+ssl_cert = </etc/dovecot/ssl/imap.bizmatch.net/fullchain1.pem
+ssl_key = </etc/dovecot/ssl/imap.bizmatch.net/privkey1.pem
+
+# SNI-Konfiguration (korrigierte Syntax)
+service imap-login {
+  ssl_server_name = imap.haiky.app {
+    ssl_cert = </etc/dovecot/ssl/imap.haiky.app/fullchain1.pem
+    ssl_key = </etc/dovecot/ssl/imap.haiky.app/privkey1.pem
+  }
+  
+  ssl_server_name = imap.andreasknuth.de {
+    ssl_cert = </etc/dovecot/ssl/imap.andreasknuth.de/fullchain1.pem
+    ssl_key = </etc/dovecot/ssl/imap.andreasknuth.de/privkey1.pem
+  }
+}
\ No newline at end of file
diff --git a/dovecot/docker-compose24.yml b/dovecot/docker-compose24.yml
new file mode 100644
index 0000000..ac99b90
--- /dev/null
+++ b/dovecot/docker-compose24.yml
@@ -0,0 +1,24 @@
+version: '3.8'
+
+services:
+  dovecot:
+    image: dovecot/dovecot:2.4-latest  # Oder spezifische 2.4.x Version
+    container_name: dovecot24
+    restart: unless-stopped
+    ports:
+      - "143:143"   # IMAP
+      - "993:993"   # IMAPS (SSL/TLS)
+      - "110:110"   # POP3
+      - "995:995"   # POP3S (SSL/TLS)
+    volumes:
+      - ./config/doveconf24.conf:/etc/dovecot/dovecot.conf  # Pfad zur Konfig
+      - ./ssl:/etc/dovecot/ssl
+      - ./mail:/var/mail
+      - ./log:/var/log
+    command: ["dovecot", "-F"]  # Foreground mit eigener Konfig
+    networks:
+      - mail_network
+
+networks:
+  mail_network:
+    driver: bridge
\ No newline at end of file