Working out dovecot access on postgresql

diff --git a/sql/datatest.sql b/sql/datatest.sql
index 317694efa05186e58e5122bfebcfae62d7b30e73..1207b63983191bcb2c7edb9975ab68155aef4015 100644 (file)
--- a/sql/datatest.sql
+++ b/sql/datatest.sql
@@ -6,19 +6,19 @@
 //present password is crypte 'mailleur'
 //adding a list of local email
 
-INSERT INTO emails (email,passwd)              \
+INSERT INTO emails (email,password)            \
         values ('postmaster@example.com','$1$cBO23lDG$7l.Ooe7pF.gf8t6tD2mKp0');
-INSERT INTO emails (email,passwd)              \
+INSERT INTO emails (email,password)            \
         values ('webmaster@example.com','$1$cBO23lDG$7l.Ooe7pF.gf8t6tD2mKp0');
 
 //Set for Postgresql database
-INSERT INTO emails (email,passwd)               \
+INSERT INTO emails (email,password)               \
          values ('user1@posdb.example.com','$1$cBO23lDG$7l.Ooe7pF.gf8t6tD2mKp0');
-INSERT INTO emails (email,passwd)               \
+INSERT INTO emails (email,password)               \
          values ('user2@posdb.example.com','$1$cBO23lDG$7l.Ooe7pF.gf8t6tD2mKp0');
 
 //Set for MySQL database
-INSERT INTO emails (email,passwd)               \
+INSERT INTO emails (email,password)               \
          values ('user1@mardb.example.com','$1$cBO23lDG$7l.Ooe7pF.gf8t6tD2mKp0');
-INSERT INTO emails (email,passwd)               \
+INSERT INTO emails (email,password)               \
          values ('user2@mardb.example.com','$1$cBO23lDG$7l.Ooe7pF.gf8t6tD2mKp0');

diff --git a/sql/mailleur.sql b/sql/mailleur.sql
index 01adb0d90d9e74ba183100a3aabb1a007e75aa08..3df5cb8d60082430846caa83a281eba1bbd8804e 100644 (file)
--- a/sql/mailleur.sql
+++ b/sql/mailleur.sql
@@ -49,13 +49,13 @@
 /*                                                     */
 /********************************************************/
 CREATE TABLE emails    (
-       email   TEXTUNIQUE,     //User email
-       passwd  TEXT            //User password
-               DFLT '!',
-       space   INTEGER         //space used by user email      
-               DFLT 0,
-       mxspace INTEGER         //Maximun space available
-               DFLT 20000      //to user (20 Gig).
+       email           TEXTUNIQUE,     //User email
+       password        TEXT            //User password
+                       DFLT '!',
+       space           INTEGER         //space used by user email      
+                       DFLT 0,
+       mxspace         INTEGER         //Maximun space available
+                       DFLT 20000      //to user (20 Gig).
        );
 GRANT SELECT,INSERT,UPDATE,DELETE      ON emails TO mailapache;
 GRANT SELECT                           ON emails TO maildove;

diff --git a/support/addconfig.sh b/support/addconfig.sh
index 933566751f8989549935d0ed8d47adc56736df6f..608a57777780ad7ce59e6ff95cd344dbe89f2f98 100755 (executable)
--- a/support/addconfig.sh
+++ b/support/addconfig.sh
@@ -3,6 +3,7 @@
 #Shell script to add local information to configuration file
 #-----------------------------------------------------------------
 export APPNAME=mailleur
+export SPOOLDIR=/var/spool/$APPNAME/mails
 #loading all applications variables
 [ -f /etc/$APPNAME/$APPNAME.conf ] && . /etc/$APPNAME/$APPNAME.conf
 #overiding some variable by local setting
@@ -25,12 +26,14 @@ case "$DB_TYPE" in
    "POSTGRESQL"                )
       echo "driver = pgsql"
       echo "connect=  dbname=$APPNAME"
-      echo "password_query=SELECT passwd FROM emails WHERE email='%u'"
+      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:~/dovecot' AS mail,'*:storage='||mxspace||'M' AS quota_rule FROM email WHERE email='%u'"
+
       ;;
    "MYSQL"             )
       echo "driver = mysql"
       echo "connect= host=localhost dbname=$APPNAME"
-      echo "password_query=SELECT passwd FROM emails WHERE email='%u'"
+      echo "password_query=SELECT password FROM emails WHERE email='%u'"
       ;;
     esac
 ) >> /etc/$APPNAME/dovecot/dovecot-sql.conf