[vhffs-dev] [2159] fixed courier configuration example

[subversion@xxxxxxxxxxxxx]

Revision: 2159
Author:   gradator
Date:     2012-04-26 21:25:07 +0200 (Thu, 26 Apr 2012)
Log Message:
-----------
fixed courier configuration example

Modified Paths:
--------------
    trunk/vhffs-doc/config/courier/authpgsqlrc

Modified: trunk/vhffs-doc/config/courier/authpgsqlrc
===================================================================
--- trunk/vhffs-doc/config/courier/authpgsqlrc	2012-04-25 23:43:58 UTC (rev 2158)
+++ trunk/vhffs-doc/config/courier/authpgsqlrc	2012-04-26 19:25:07 UTC (rev 2159)
@@ -58,18 +58,18 @@
 # The name of the table containing your user data.  See README.authmysqlrc
 # for the required fields in this table (both MySQL and Postgress use the
 # same suggested layout.
+#
+# PGSQL_USER_TABLE	passwd
 
-PGSQL_USER_TABLE	passwd
-
 ##NAME: PGSQL_CRYPT_PWFIELD:0
 #
 # Either PGSQL_CRYPT_PWFIELD or PGSQL_CLEAR_PWFIELD must be defined.  Both
 # are OK too. crypted passwords go into PGSQL_CRYPT_PWFIELD, cleartext
 # passwords go into PGSQL_CLEAR_PWFIELD.  Cleartext passwords allow
 # CRAM-MD5 authentication to be implemented.
+#
+# PGSQL_CRYPT_PWFIELD	crypt
 
-PGSQL_CRYPT_PWFIELD	crypt
-
 ##NAME: PGSQL_CLEAR_PWFIELD:0
 #
 #
@@ -89,34 +89,34 @@
 #
 # PGSQL_UID_FIELD - contains the numerical userid of the account
 #
-PGSQL_UID_FIELD		uid
+# PGSQL_UID_FIELD		uid
 
 ##NAME: PGSQL_GID_FIELD:0
 #
 # Numerical groupid of the account
+#
+# PGSQL_GID_FIELD		gid
 
-PGSQL_GID_FIELD		gid
-
 ##NAME: PGSQL_LOGIN_FIELD:0
 #
 # The login id, default is id.  Basically the query is:
 #
 #  SELECT PGSQL_UID_FIELD, PGSQL_GID_FIELD, ... WHERE id='loginid'
 #
+#
+# PGSQL_LOGIN_FIELD	id
 
-PGSQL_LOGIN_FIELD	id
-
 ##NAME: PGSQL_HOME_FIELD:0
 #
+#
+# PGSQL_HOME_FIELD	home
 
-PGSQL_HOME_FIELD	home
-
 ##NAME: PGSQL_NAME_FIELD:0
 #
 # The user's name (optional)
+#
+# PGSQL_NAME_FIELD	name
 
-PGSQL_NAME_FIELD	name
-
 ##NAME: PGSQL_MAILDIR_FIELD:0
 #
 # This is an optional field, and can be used to specify an arbitrary
@@ -213,7 +213,7 @@
 #			AND popbox.domain_name = '$(domain)'		\
 #			AND popbox.domain_name = domain.domain_name
 
-PGSQL_SELECT_CLAUSE	SELECT lp.localpart||'@'||mx.domain, lp.password, '', 101, 103, '/data/mail/boxes/'||substr(mx.domain,1,1)||'/'||substr(mx.domain,2,1)||'/'||mx.domain||'/'||substr(lp.localpart,1,1)||'/'||lp.localpart, 'Maildir', '', '', '' FROM vhffs_mx mx INNER JOIN vhffs_mx_localpart lp ON lp.mx_id=lp.mx_id INNER JOIN vhffs_mx_box b ON b.localpart_id=lp.localpart_id WHERE b.state=6 AND lp.localpart='test' AND mx.domain='test.com' AND ( ('$(service)' LIKE 'pop%' AND b.allowpop=true) OR ('$(service)' LIKE 'imap%' AND b.allowimap=true) )
+PGSQL_SELECT_CLAUSE	SELECT lp.localpart||'@'||mx.domain, lp.password, '', 104, 108, '/data/mail/boxes/'||substr(mx.domain,1,1)||'/'||substr(mx.domain,2,1)||'/'||mx.domain||'/'||substr(lp.localpart,1,1)||'/'||lp.localpart, 'Maildir', '', '' FROM vhffs_mx mx INNER JOIN vhffs_mx_localpart lp ON lp.mx_id=lp.mx_id INNER JOIN vhffs_mx_box b ON b.localpart_id=lp.localpart_id WHERE b.state=6 AND lp.localpart='$(local_part)' AND mx.domain='$(domain)' AND ( ('$(service)' LIKE 'pop%' AND b.allowpop=true) OR ('$(service)' LIKE 'imap%' AND b.allowimap=true) )
 
 ##NAME: PGSQL_ENUMERATE_CLAUSE:1
 #