From 7f30b430dd244d8cc3cb7db5b6b361c96f59539d Mon Sep 17 00:00:00 2001
From: Andreas Knuth <andreas.knuth@gmail.com>
Date: Sat, 15 Mar 2025 10:24:09 +0100
Subject: [PATCH] dovecot 2.3.21.1

---
 dovecot/config/dovecot.conf    | 40 ++++++++++++++++++++++++++++++++++
 dovecot/config/passwd          |  4 ++++
 dovecot/docker-compose-240.yml | 24 ++++++++++++++++++++
 dovecot/docker-compose.yml     | 16 +++++++-------
 4 files changed, 76 insertions(+), 8 deletions(-)
 create mode 100644 dovecot/config/dovecot.conf
 create mode 100644 dovecot/config/passwd
 create mode 100644 dovecot/docker-compose-240.yml

diff --git a/dovecot/config/dovecot.conf b/dovecot/config/dovecot.conf
new file mode 100644
index 0000000..e417471
--- /dev/null
+++ b/dovecot/config/dovecot.conf
@@ -0,0 +1,40 @@
+# Dovecot Konfiguration mit Plain-Text Passwörtern
+# Für Version 2.3.21.1
+
+# Protokolle aktivieren
+protocols = imap pop3
+
+# Logging
+log_path = /var/log/dovecot.log
+info_log_path = /var/log/dovecot-info.log
+debug_log_path = /var/log/dovecot-debug.log
+
+# Mail-Location
+mail_location = maildir:/var/mail/%u
+
+# Authentifizierung
+auth_mechanisms = plain login
+disable_plaintext_auth = no
+
+# Benutzerdatenbank (passwd-datei)
+passdb {
+  driver = passwd-file
+  args = scheme=PLAIN username_format=%u /etc/dovecot/passwd
+}
+
+userdb {
+  driver = passwd-file
+  args = username_format=%u /etc/dovecot/passwd
+}
+
+# Passwort-Schema (plaintext)
+default_pass_scheme = PLAIN
+
+# Mail-Berechtigungen
+mail_uid = vmail
+mail_gid = vmail
+
+# SSL-Konfiguration
+ssl = yes
+ssl_cert = </etc/dovecot/ssl/dovecot.crt
+ssl_key = </etc/dovecot/ssl/dovecot.key
\ No newline at end of file
diff --git a/dovecot/config/passwd b/dovecot/config/passwd
new file mode 100644
index 0000000..edde2c7
--- /dev/null
+++ b/dovecot/config/passwd
@@ -0,0 +1,4 @@
+# Format: Benutzername:Passwort:UID:GID:Benutzerinfo:Home-Verzeichnis:Shell
+# Für Plaintext-Passwörter
+user1:{PLAIN}geheim:1000:1000::/var/mail/user1:/bin/false
+user2:{PLAIN}passwort123:1001:1000::/var/mail/user2:/bin/false
\ No newline at end of file
diff --git a/dovecot/docker-compose-240.yml b/dovecot/docker-compose-240.yml
new file mode 100644
index 0000000..d35989b
--- /dev/null
+++ b/dovecot/docker-compose-240.yml
@@ -0,0 +1,24 @@
+services:
+  dovecot:
+    image: dovecot/dovecot:2.4.0
+    environment:
+      - USER_PASSWORD=test1234
+      - DOVECOT_USER=info@bizmatch.net
+    container_name: dovecot
+    restart: unless-stopped
+    ports:
+      - "143:143"   # IMAP
+      - "31143:31143"
+    volumes:
+      - ./config:/etc/dovecot
+      - ./ssl:/etc/dovecot/ssl
+      - ./data/mail:/srv/vmail
+      - ./logs:/var/log
+      # Bei Bedarf: Zugriff auf Caddy-Zertifikate 
+      # - /pfad/zu/caddy/certs:/etc/dovecot/ssl:ro
+    networks:
+      - mail_network
+
+networks:
+  mail_network:
+    driver: bridge
\ No newline at end of file
diff --git a/dovecot/docker-compose.yml b/dovecot/docker-compose.yml
index 482aef5..0380b83 100644
--- a/dovecot/docker-compose.yml
+++ b/dovecot/docker-compose.yml
@@ -5,17 +5,17 @@ services:
     restart: unless-stopped
     ports:
       - "143:143"   # IMAP
-      - "993:993"   # IMAPS (IMAP über SSL)
+      - "993:993"   # IMAPS
+      - "110:110"   # POP3
+      - "995:995"   # POP3S
     volumes:
-      - ./config/dovecot:/etc/dovecot
-      - ./config/dovecot/users:/etc/dovecot/users:ro
-      - ./data/mail:/var/mail
-      - ./logs:/var/log
-      # Bei Bedarf: Zugriff auf Caddy-Zertifikate 
-      # - /pfad/zu/caddy/certs:/etc/dovecot/ssl:ro
+      - ./config:/etc/dovecot
+      - ./ssl:/etc/dovecot/ssl
+      - ./mail:/var/mail
+      - ./log:/var/log
     networks:
       - mail_network
 
 networks:
   mail_network:
-    driver: bridge      
\ No newline at end of file
+    driver: bridge
\ No newline at end of file