From 9d7e5b8b90e9a4d2af08adab2685c9ecf095e0dd Mon Sep 17 00:00:00 2001
From: "Jean-Marc Pigeon (Delson)" <jmp@safe.ca>
Date: Thu, 26 Jun 2025 10:00:11 -0400
Subject: [PATCH] Allowing dovecot to access email table within postgresql

---
 conf/dovecot/dovecot.conf | 15 +++++++--------
 mailleur.spec.in          |  1 +
 sql/mailleur.sql          | 10 ++++++----
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/conf/dovecot/dovecot.conf b/conf/dovecot/dovecot.conf
index 974cc18..9906acb 100644
--- a/conf/dovecot/dovecot.conf
+++ b/conf/dovecot/dovecot.conf
@@ -57,14 +57,13 @@ mail_debug = yes
 #to delay scanner site
 auth_failure_delay=4s
 
-userdb	{
-	driver=passwd-file
-	args = username_format=%u /etc/mailleur/dovecot/passfile
-        default_fields = uid=mailleur gid=mail 
+passdb {
+  	driver = sql
+  	args = /etc/mailleur/dovecot/dovecot-sql.conf
 	}
 
-passdb	{
-	driver= passwd-file
-	args = username_format=%u /etc/mailleur/dovecot/passfile
-	}
+userdb {
+  	driver = sql
+  	args = /etc/mailleur/dovecot/dovecot-sql.conf
+  	}
 #--------------------------------------------------------------------------
diff --git a/mailleur.spec.in b/mailleur.spec.in
index 82010a3..48a5628 100644
--- a/mailleur.spec.in
+++ b/mailleur.spec.in
@@ -153,6 +153,7 @@ Summary		:	mailleur using postgresql as Data-base
 
 Requires	:	%{name}			=  %{version}-%{release}
 Requires	:	postgresql-server
+REquires	:	dovecot-postgresql
 
 Obsoletes	:	%{name}-mysql		<= %{version}-%{release}
 #-----------------------------------------------------------------------------
diff --git a/sql/mailleur.sql b/sql/mailleur.sql
index 9896cad..b74a20d 100644
--- a/sql/mailleur.sql
+++ b/sql/mailleur.sql
@@ -15,8 +15,8 @@
 #define	TEXTUNIQUE	TEXT UNIQUE NOT NULL
 #define	INS(name)	name		/*index size	*/
 #define	ESCLIT		E
-#define	clemapache	apache
-#define	clemdove	dovecot
+#define	mailapache	apache
+#define	maildove	dovecot
 #define	CASESENSITIVE
 #define ADDTIME(adding)	'adding'
 #define	INET		inet
@@ -34,8 +34,8 @@
 #define	TEXTUNIQUE	VARCHAR(100) UNIQUE NOT NULL
 #define	INS(name)	name(80)	/*index size	*/
 #define	ESCLIT
-#define	clemapache	'apache'@'localhost'
-#define	clemdove	'dovecot'@'localhost'
+#define	mailapache	'apache'@'localhost'
+#define	maildove	'dovecot'@'localhost'
 #define	CASESENSITIVE	CHARACTER SET latin1 COLLATE latin1_bin
 #define ADDTIME(adding)	INTERVAL adding
 #define	INET		VARBINARY(16)
@@ -57,3 +57,5 @@ CREATE TABLE emails	(
 	mxspace	INTEGER		//Maximun space available
 		DFLT 20000	//to user (20 Gig).
 	);
+GRANT SELECT,INSERT,UPDATE,DELETE 	ON emails TO clemapache;
+GRANT SELECT 				ON emails TO clemdove;
-- 
2.47.3