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


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@620 a1433add-5e2c-0410-b055-b7f2511e0802

DOCUMENTS/POSTFIX_CONF.txt

@@ -57,7 +57,7 @@ user = postfix
 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 @@ user = postfix
 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,17 +87,16 @@ user = postfix
 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)