From 5f9613e16955df5f9bdd55e47634f6319d266fee Mon Sep 17 00:00:00 2001
From: Andreas Knuth <andreas.knuth@gmail.com>
Date: Fri, 14 Mar 2025 22:48:56 +0100
Subject: [PATCH] new test

---
 dovecot/config/dovecot/dovecot.conf | 27 ++++++++++++---------------
 dovecot/config/dovecot/users        |  3 ++-
 dovecot/docker-compose.yml          |  5 ++---
 3 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/dovecot/config/dovecot/dovecot.conf b/dovecot/config/dovecot/dovecot.conf
index d0ba58f..681200a 100644
--- a/dovecot/config/dovecot/dovecot.conf
+++ b/dovecot/config/dovecot/dovecot.conf
@@ -1,29 +1,26 @@
 # /etc/dovecot/dovecot.conf (im Container)
 
-# Konfigurationsversion (muss die erste Einstellung sein)
-dovecot_config_version = 2.4.0
-
 # Grundlegende Einstellungen
 protocols = imap
 listen = *, ::
 
 # Benutzerauthentifizierung
 auth_mechanisms = plain login
-# passdb {
-#  driver = passwd-file
-#  args = scheme=CRYPT username_format=%u /etc/dovecot/users
-# }
-passdb some_name {
+
+# Plaintext-Authentifizierung erlauben
+disable_plaintext_auth = no
+
+passdb {
   driver = passwd-file
-  args = scheme=PLAIN username_format=%u /etc/dovecot/users  # Geändert zu PLAIN für Testzwecke
+  args = /etc/dovecot/users
 }
 userdb {
-  driver = static
-  args = uid=vmail gid=vmail home=/var/mail/%d/%n
+  driver = passwd-file
+  args = /etc/dovecot/users
 }
 
 # Mail-Speicherort
-mail_location = mdbox:/var/mail/%d/%n
+mail_location = maildir:/var/mail/%u
 
 # Da wir hinter Caddy sind, können wir TLS auf Dovecot deaktivieren
 # oder nur intern auf nicht-exponierten Ports aktivieren
@@ -35,9 +32,9 @@ ssl = no
 # ssl_key = </etc/dovecot/ssl/privkey.pem
 
 # IMAP-Konfiguration
-protocol imap {
-  mail_plugins = $mail_plugins
-}
+# protocol imap {
+#   mail_plugins = $mail_plugins
+# }
 
 # Logging
 log_path = /var/log/dovecot.log
diff --git a/dovecot/config/dovecot/users b/dovecot/config/dovecot/users
index bc654c0..6bc0ff1 100644
--- a/dovecot/config/dovecot/users
+++ b/dovecot/config/dovecot/users
@@ -1 +1,2 @@
-testuser:{PLAIN}test123:::vmail:vmail::/var/mail/example.com/testuser
\ No newline at end of file
+user1:password123
+user2:secret456
\ No newline at end of file
diff --git a/dovecot/docker-compose.yml b/dovecot/docker-compose.yml
index c6158b4..482aef5 100644
--- a/dovecot/docker-compose.yml
+++ b/dovecot/docker-compose.yml
@@ -1,6 +1,6 @@
 services:
   dovecot:
-    image: dovecot/dovecot:latest
+    image: dovecot/dovecot:2.3.21.1
     container_name: dovecot
     restart: unless-stopped
     ports:
@@ -8,12 +8,11 @@ services:
       - "993:993"   # IMAPS (IMAP über SSL)
     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
-    environment:
-      - TZ=Europe/Berlin
     networks:
       - mail_network