From b6a60f8a205637a03d107501c542f355e172ccbd Mon Sep 17 00:00:00 2001
From: Andreas Knuth <andreas.knuth@gmail.com>
Date: Sun, 23 Mar 2025 20:45:54 +0100
Subject: [PATCH] change

---
 dovecot/config/doveconf24.conf | 62 -------------------------------
 dovecot/config/dovecot24.conf  | 67 ++++++++++++++++++++++++++++++++++
 dovecot/docker-compose24.yml   |  4 +-
 3 files changed, 70 insertions(+), 63 deletions(-)
 delete mode 100644 dovecot/config/doveconf24.conf
 create mode 100644 dovecot/config/dovecot24.conf

diff --git a/dovecot/config/doveconf24.conf b/dovecot/config/doveconf24.conf
deleted file mode 100644
index 3679353..0000000
--- a/dovecot/config/doveconf24.conf
+++ /dev/null
@@ -1,62 +0,0 @@
-dovecot_config_version = 2.4.0
-dovecot_storage_version = 2.4.0
-
-# Dovecot 2.4.x Konfiguration
-# Protokolle (korrigiert zurück zu 'imap')
-protocols = imap pop3
-
-# Logging (Block-Syntax)
-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_driver=maildir
-mailbox_list_layout=index
-mailbox_list_utf8=yes
-mail_path=~/mail
-mail_home=/var/vmail/%{user|lower}
-mail_utf8_extensions = yes
-
-default_internal_user = vmail
-default_login_user = vmail
-default_internal_group = vmail
-
-mail_uid = vmail
-mail_gid = vmail
-
-# Authentifizierung
-auth_mechanisms = plain login
-auth_allow_cleartext = yes
-
-# Passwd-Datenbank (mit Namen und korrekter Syntax)
-passdb passwd-file {
-  passdb_driver = passwd-file
-  passdb_args = username_format=%u password_hash=plaintext /etc/dovecot/passwd
-}
-
-userdb passwd-file {
-  userdb_driver = passwd-file
-  userdb_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/config/dovecot24.conf b/dovecot/config/dovecot24.conf
new file mode 100644
index 0000000..50a29b0
--- /dev/null
+++ b/dovecot/config/dovecot24.conf
@@ -0,0 +1,67 @@
+dovecot_config_version = 2.4.0
+dovecot_storage_version = 2.4.0
+
+# Dovecot 2.4.x Konfiguration
+# Protokolle (korrigiert zurück zu 'imap')
+protocols = imap pop3
+
+# Logging (Block-Syntax)
+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_driver=maildir
+mailbox_list_layout=index
+mailbox_list_utf8=yes
+mail_path=~/mail
+mail_home=/var/vmail/%{domain|lower}/%{user|lower}
+mail_utf8_extensions = yes
+
+default_internal_user = vmail
+default_login_user = vmail
+default_internal_group = vmail
+
+mail_uid = vmail
+mail_gid = vmail
+
+# Authentifizierung
+# auth_mechanisms = plain login
+# auth_allow_cleartext = yes
+
+# Passwd-Datenbank (mit Namen und korrekter Syntax)
+# passdb passwd-file {
+#   passdb_driver = passwd-file
+#   passdb_args = username_format=%u password_hash=plaintext /etc/dovecot/passwd
+# }
+passdb static {
+  password=%{env:USER_PASSWORD}
+}
+
+# userdb passwd-file {
+#   userdb_driver = passwd-file
+#   userdb_args = username_format=%u uid=vmail gid=vmail /etc/dovecot/passwd
+# }
+
+ssl_server_cert_file = /etc/dovecot/ssl/imap.bizmatch.net/fullchain1.pem
+ssl_server_key_file = /etc/dovecot/ssl/imap.bizmatch.net/privkey1.pem
+# 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
index 8b9fcca..977e375 100644
--- a/dovecot/docker-compose24.yml
+++ b/dovecot/docker-compose24.yml
@@ -9,10 +9,12 @@ services:
       - "110:110"   # POP3
       - "995:995"   # POP3S (SSL/TLS)
     volumes:
-      - ./config/doveconf24.conf:/etc/dovecot/dovecot.conf  # Pfad zur Konfig
+      - ./config/dovecot24.conf:/etc/dovecot/dovecot.conf  # Pfad zur Konfig
       - ./ssl:/etc/dovecot/ssl
       - ./mail:/var/mail
       - ./log:/var/log
+    environment:
+      - USER_PASSWORD : 'SUPERSECRET'
     command: ["dovecot", "-F"]  # Foreground mit eigener Konfig
     networks:
       - mail_network