From 59df174d49928e7f087fa0bebe791eb79fec6c77 Mon Sep 17 00:00:00 2001
From: "Jean-Marc Pigeon (Delson)" <jmp@safe.ca>
Date: Thu, 10 Jul 2025 07:49:48 -0400
Subject: [PATCH] dovecot configuration working as "plain login digest-md5"

---
 conf/dovecot/dovecot.conf | 30 ++++++++++++++++++++----------
 support/addconfig.sh      | 24 +++++++++++++++++++++++-
 2 files changed, 43 insertions(+), 11 deletions(-)

diff --git a/conf/dovecot/dovecot.conf b/conf/dovecot/dovecot.conf
index 949c018..c1b177e 100644
--- a/conf/dovecot/dovecot.conf
+++ b/conf/dovecot/dovecot.conf
@@ -12,8 +12,7 @@ first_valid_gid=12
 #debug level
 auth_debug = yes
 auth_debug_passwords = yes
-#auth_mechanisms = plain login digest-md5
-auth_mechanisms = digest-md5
+auth_mechanisms = plain login digest-md5
 auth_verbose = yes
 auth_verbose_passwords = plain
 mail_uid = mailleur
@@ -56,13 +55,24 @@ auth_realms = mailleur-email
 #to delay scanner site
 auth_failure_delay=4s
 
-passdb {
-  	driver = sql
-  	args = /etc/mailleur/dovecot/dovecot-sql.conf
-	}
+passdb digest {
+        driver = sql
+        args = /etc/mailleur/dovecot/dovecot-digest-sql.conf
+        }
+
+userdb digest {
+        driver = sql
+        args = /etc/mailleur/dovecot/dovecot-digest-sql.conf
+        }
+
+passdb plain {
+        driver = sql
+        args = /etc/mailleur/dovecot/dovecot-plain-sql.conf
+        }
+
+userdb plain {
+        driver = sql
+        args = /etc/mailleur/dovecot/dovecot-plain-sql.conf
+        }
 
-userdb {
-  	driver = sql
-  	args = /etc/mailleur/dovecot/dovecot-sql.conf
-  	}
 #--------------------------------------------------------------------------
diff --git a/support/addconfig.sh b/support/addconfig.sh
index a798215..ec337c0 100755
--- a/support/addconfig.sh
+++ b/support/addconfig.sh
@@ -39,5 +39,27 @@ case "$DB_TYPE" in
       echo "user_query=SELECT 'mailleur' AS uid,'mail' AS gid,'$SPOOLDIR/%d/%n' AS home,'maildir:~' AS mail,concat('*:storage=',mxspace,'M') AS quota_rule from emails WHERE email='%u'"
       ;;
     esac
-) >> /etc/$APPNAME/dovecot/dovecot-sql.conf 2>&1
+) >> /etc/$APPNAME/dovecot/dovecot-digest-sql.conf 2>&1
+
+(
+echo "#Added by addconfig.sh for $DB_TYPE data-base type" 
+echo "#"`date`
+case "$DB_TYPE" in
+   "POSTGRESQL"		)
+      echo "driver = pgsql"
+      echo "default_pass_scheme = CRYPT"
+      echo "connect=  dbname=$APPNAME"
+      echo "password_query=SELECT password FROM emails WHERE email='%u'"
+      echo "user_query=SELECT 'mailleur' AS uid,'mail' AS gid,'$SPOOLDIR/%d/%n' AS home,'maildir:~' AS mail,'*:storage='||mxspace||'M' AS quota_rule FROM emails WHERE email='%u'"
+
+      ;;
+   "MYSQL"    		)
+      echo "driver = mysql"
+      echo "default_pass_scheme = CRYPT"
+      echo "connect= host=localhost dbname=$APPNAME"
+      echo "password_query=SELECT password FROM emails WHERE email='%u'"
+      echo "user_query=SELECT 'mailleur' AS uid,'mail' AS gid,'$SPOOLDIR/%d/%n' AS home,'maildir:~' AS mail,concat('*:storage=',mxspace,'M') AS quota_rule from emails WHERE email='%u'"
+      ;;
+    esac
+) >> /etc/$APPNAME/dovecot/dovecot-digest-plain-sql.conf 2>&1
 
-- 
2.47.3