SF.net SVN: postfixadmin:[620] trunk/DOCUMENTS/POSTFIX_CONF.txt

[<chr...@us...>]

Revision: 620
          http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=620&view=rev
Author:   christian_boltz
Date:     2009-04-09 20:46:44 +0000 (Thu, 09 Apr 2009)

Log Message:
-----------
POSTFIX_CONF.txt.
- honor alias_domain.active (see mail from Daniel Reichelt in postfixadmin-devel)
- fix query for maildir in virtual_mailbox_maps - the maildir field already 
  contains the domain (exact layout depends on the $CONF settings), so there's
  no need to prepend it again

Modified Paths:
--------------
    trunk/DOCUMENTS/POSTFIX_CONF.txt

Modified: trunk/DOCUMENTS/POSTFIX_CONF.txt
===================================================================
--- trunk/DOCUMENTS/POSTFIX_CONF.txt	2009-04-09 20:05:45 UTC (rev 619)
+++ trunk/DOCUMENTS/POSTFIX_CONF.txt	2009-04-09 20:46:44 UTC (rev 620)
@@ -57,7 +57,7 @@
 password = password
 hosts = localhost
 dbname = postfix
-query = SELECT goto FROM alias,alias_domain WHERE alias_domain.alias_domain = '%d' and alias.address = CONCAT('%u', '@', alias_domain.target_domain) AND alias.active = 1
+query = SELECT goto FROM alias,alias_domain WHERE alias_domain.alias_domain = '%d' and alias.address = CONCAT('%u', '@', alias_domain.target_domain) AND alias.active = 1 AND alias_domain.active='1'
 
 (Note: PostgreSQL does not have a concat() function, instead use e.g. .... alias.address = '%u' || '@' || alias_domain.target_domain AND ....)
  
@@ -67,7 +67,7 @@
 password = password
 hosts = localhost
 dbname = postfix
-query  = SELECT goto FROM alias,alias_domain WHERE alias_domain.alias_domain = '%d' and alias.address = CONCAT('@', alias_domain.target_domain) AND alias.active = 1
+query  = SELECT goto FROM alias,alias_domain WHERE alias_domain.alias_domain = '%d' and alias.address = CONCAT('@', alias_domain.target_domain) AND alias.active = 1 AND alias_domain.active='1'
 
 (See above note re Concat + PostgreSQL)
 
@@ -87,18 +87,17 @@
 password = password
 hosts = localhost
 dbname = postfix
-query           = SELECT CONCAT(domain,'/',maildir) FROM mailbox WHERE username='%s' AND active = '1'
+query           = SELECT maildir FROM mailbox WHERE username='%s' AND active = '1'
 #expansion_limit = 100
 
-(See above note re Concat + PostgreSQL)
-
 mysql_virtual_alias_domain_mailbox_maps.cf:
 user = postfix
 password = password
 hosts = localhost
 dbname = postfix
-query = SELECT CONCAT(domain,'/',maildir) FROM mailbox,alias_domain WHERE alias_domain.alias_domain = '%d' and mailbox.username = CONCAT('%u', '@', alias_domain.target_domain) AND mailbox.active = 1
+query = SELECT maildir FROM mailbox,alias_domain WHERE alias_domain.alias_domain = '%d' and mailbox.username = CONCAT('%u', '@', alias_domain.target_domain) AND mailbox.active = 1 AND alias_domain.active='1'
 
+
 (See above note re Concat + PostgreSQL)
 
 # For quota support


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.