Fixing dovecot conf.d configuration file

diff --git a/dovecot/conf.d/70-mailleur-mysql.conf b/dovecot/conf.d/70-mailleur-mysql.conf
index 716f1ba9147bcff568fa92c318555dbc67c7525c..7895daac6d53ff98ed58b18d83c19d06b3771aec 100644 (file)
--- a/dovecot/conf.d/70-mailleur-mysql.conf
+++ b/dovecot/conf.d/70-mailleur-mysql.conf
@@ -6,6 +6,6 @@ sql_driver = mysql
 
 mysql remote {
         host = localhost.localdomain
-        user = clement
-        dbname = clement
+        user = mailleur
+        dbname = mailleur
         }

diff --git a/dovecot/conf.d/70-mailleur-pgsql.conf b/dovecot/conf.d/70-mailleur-pgsql.conf
index 1a68e38e79c40e1dabb66ec2c9b8fa94c10c8265..ca34767c8609c82417ac45cdf2c3e9a5da9ef7c2 100644 (file)
--- a/dovecot/conf.d/70-mailleur-pgsql.conf
+++ b/dovecot/conf.d/70-mailleur-pgsql.conf
@@ -7,7 +7,7 @@ sql_driver = pgsql
 pgsql remote {
        parameters {
                host = localhost.localdomain
-               user = clement
-               dbname = clement
+               user = mailleur
+               dbname = mailleur
                }
        }

diff --git a/dovecot/conf.d/80-mailleur-usesql.conf b/dovecot/conf.d/80-mailleur-usesql.conf
index 472be09c63760915f294743680400ef4783bd72a..918823d5d11cb34aafd6fde451799d3502351fb2 100644 (file)
--- a/dovecot/conf.d/80-mailleur-usesql.conf
+++ b/dovecot/conf.d/80-mailleur-usesql.conf
@@ -5,7 +5,7 @@
 # --- Passdb : authentication via SQL ---
 passdb sql     {
        default_password_scheme = SHA512-CRYPT
-       query = SELECT password FROM users WHERE username='%{user}';
+       query = SELECT password FROM emails WHERE username='%{user}';
        }
 
 # --- Userdb : user data(home, uid, gid) via SQL ---
@@ -14,11 +14,10 @@ passdb      sql     {
 #
 
 userdb sql {
-       query = SELECT 'clement' AS uid,'mail' AS gid,                  \
-                    '/var/spool/clement/mails/%{user | domain}/%{user | username}' \
-                     AS home, \
-                    'maildir:~/dovecot' AS mail, \
-                    '*:storage='||mxmgbytes||'M' AS quota_rule FROM userprofile WHERE prfid=(SELECT prfid FROM users WHERE username='%{user}')
+       query = SELECT 'mailleur' AS uid,'mail' AS gid,                 \
+                '/var/spool/mailleur/mails/%{user | domain}/%{user | username}' \
+                AS home,'maildir:~/dovecot' AS mail,                   \
+                FROM emails WHERE email='%{user}')
        }