Merge branch 'vmailuid' of /home/git/repositories/renky/ispconfig3

Author: Marius Cramer

install/dist/lib/debian60.lib.php

@@ -57,7 +57,7 @@ public function configure_dovecot()
 		// Adding the amavisd commands to the postfix configuration
 		$postconf_commands = array (
 			'dovecot_destination_recipient_limit = 1',
-			'virtual_transport = dovecot',
+			'virtual_transport = lmtp:unix:private/dovecot-lmtp',
 			'smtpd_sasl_type = dovecot',
 			'smtpd_sasl_path = private/auth'
 		);

install/dist/lib/fedora.lib.php

@@ -402,7 +402,7 @@ public function configure_dovecot()
 		// Adding the amavisd commands to the postfix configuration
 		$postconf_commands = array (
 			'dovecot_destination_recipient_limit = 1',
-			'virtual_transport = dovecot',
+			'virtual_transport = lmtp:unix:private/dovecot-lmtp',
 			'smtpd_sasl_type = dovecot',
 			'smtpd_sasl_path = private/auth',
 			'receive_override_options = no_address_mappings'

install/dist/lib/gentoo.lib.php

@@ -245,7 +245,7 @@ public function configure_dovecot()
 		//* Reconfigure postfix to use dovecot authentication
 		$postconf_commands = array (
 			'dovecot_destination_recipient_limit = 1',
-			'virtual_transport = dovecot',
+			'virtual_transport = lmtp:unix:private/dovecot-lmtp',
 			'smtpd_sasl_type = dovecot',
 			'smtpd_sasl_path = private/auth'
 		);

install/dist/lib/opensuse.lib.php

@@ -437,7 +437,7 @@ public function configure_dovecot()
 		// Adding the amavisd commands to the postfix configuration
 		$postconf_commands = array (
 			'dovecot_destination_recipient_limit = 1',
-			'virtual_transport = dovecot',
+			'virtual_transport = lmtp:unix:private/dovecot-lmtp',
 			'smtpd_sasl_type = dovecot',
 			'smtpd_sasl_path = private/auth',
 			'receive_override_options = no_address_mappings'

install/sql/incremental/upd_0064.sql

@@ -0,0 +1,2 @@
+ALTER TABLE `mail_user` ADD `disablelmtp` ENUM( 'n', 'y' ) NOT NULL DEFAULT 'n' AFTER `disablelda` ;
+ALTER TABLE `mail_user` CHANGE `uid` `uid` INT( 11 ) NOT NULL DEFAULT '5000', CHANGE `gid` `gid` INT( 11 ) NOT NULL DEFAULT '5000' ;

install/sql/ispconfig3.sql

@@ -910,6 +910,7 @@ CREATE TABLE `mail_user` (
   `disablesmtp` enum('n','y') NOT NULL default 'n',
   `disablesieve` enum('n','y') NOT NULL default 'n',
   `disablelda` enum('n','y') NOT NULL default 'n',
+  `disablelmtp` enum('n','y') NOT NULL default 'n',
   `disabledoveadm` enum('n','y') NOT NULL default 'n',
   `last_quota_notification` date NULL default NULL,
   `backup_interval` VARCHAR( 255 ) NOT NULL,

install/tpl/debian6_dovecot2.conf.master

@@ -1,5 +1,5 @@
 listen = *,[::]
-protocols = imap pop3
+protocols = imap pop3 lmtp
 auth_mechanisms = plain login
 disable_plaintext_auth = no
 log_timestamp = "%Y-%m-%d %H:%M:%S "
@@ -31,6 +31,13 @@ service auth {
   }
   user = root
 }
+service lmtp {
+  unix_listener /var/spool/postfix/private/dovecot-lmtp {
+   group = postfix
+   mode = 0600
+   user = postfix
+  }
+}
 service imap-login {
   client_limit = 1000
   process_limit = 500
@@ -44,4 +51,8 @@ protocol pop3 {
 }
 protocol lda {
   mail_plugins = sieve quota
+}
+protocol lmtp {
+  postmaster_address = webmaster@localhost
+  mail_plugins = quota sieve
 }

install/tpl/debian_dovecot2.conf.master

@@ -1,5 +1,5 @@
 listen = *,[::]
-protocols = imap pop3
+protocols = imap pop3 lmtp
 auth_mechanisms = plain login
 disable_plaintext_auth = no
 log_timestamp = "%Y-%m-%d %H:%M:%S "
@@ -31,6 +31,13 @@ service auth {
   }
   user = root
 }
+service lmtp {
+  unix_listener /var/spool/postfix/private/dovecot-lmtp {
+   group = postfix
+   mode = 0600
+   user = postfix
+  }
+}
 service imap-login {
   client_limit = 1000
   process_limit = 500
@@ -44,4 +51,8 @@ protocol pop3 {
 }
 protocol lda {
   mail_plugins = sieve quota
+}
+protocol lmtp {
+  postmaster_address = webmaster@localhost
+  mail_plugins = quota sieve
 }

install/tpl/debian_postfix.conf.master

@@ -5,8 +5,8 @@ virtual_alias_maps = proxy:mysql:{config_dir}/mysql-virtual_forwardings.cf, prox
 virtual_mailbox_domains = proxy:mysql:{config_dir}/mysql-virtual_domains.cf
 virtual_mailbox_maps = proxy:mysql:{config_dir}/mysql-virtual_mailboxes.cf
 virtual_mailbox_base = {vmail_mailbox_base}
-virtual_uid_maps = static:{vmail_userid}
-virtual_gid_maps = static:{vmail_groupid}
+virtual_uid_maps = mysql:/etc/postfix/mysql-virtual_uids.cf
+virtual_gid_maps = mysql:/etc/postfix/mysql-virtual_gids.cf
 inet_protocols=all
 smtpd_sasl_auth_enable = yes
 broken_sasl_auth_clients = yes
@@ -25,7 +25,7 @@ smtpd_client_restrictions = check_client_access mysql:{config_dir}/mysql-virtual
 smtpd_client_message_rate_limit = 100
 maildrop_destination_concurrency_limit = 1
 maildrop_destination_recipient_limit   = 1
-virtual_transport = maildrop
+virtual_transport = lmtp:unix:private/dovecot-lmtp
 header_checks = regexp:{config_dir}/header_checks
 mime_header_checks = regexp:{config_dir}/mime_header_checks
 nested_header_checks = regexp:{config_dir}/nested_header_checks

install/tpl/fedora_dovecot2.conf.master

@@ -1,5 +1,5 @@
 listen = *,[::]
-protocols = imap pop3
+protocols = imap pop3 lmtp
 auth_mechanisms = plain login
 disable_plaintext_auth = no
 log_timestamp = "%Y-%m-%d %H:%M:%S "
@@ -31,6 +31,13 @@ service auth {
   }
   user = root
 }
+service lmtp {
+  unix_listener /var/spool/postfix/private/dovecot-lmtp {
+   group = postfix
+   mode = 0600
+   user = postfix
+  }
+}
 service imap-login {
   client_limit = 1000
   process_limit = 500
@@ -44,4 +51,8 @@ protocol pop3 {
 }
 protocol lda {
   mail_plugins = sieve quota
+}
+protocol lmtp {
+  postmaster_address = webmaster@localhost
+  mail_plugins = quota sieve
 }