moved dovecot-lmtpd from install/update to server-plugin to prevented dovecot-errors when using dovecot without dovecot-lmtpd

Florian Schaal · Florian Schaal · commit 8b23f8271380 · 2015-07-08T15:28:26.000+02:00
diff --git a/install/dist/lib/debian60.lib.php b/install/dist/lib/debian60.lib.php
@@ -35,6 +35,8 @@ public function configure_dovecot()
 		global $conf;
 		
 		$virtual_transport = 'dovecot';
+
+		$configure_lmtp = false;
 		
 		// check if virtual_transport must be changed
 		if ($this->is_update) {
@@ -44,6 +46,7 @@ public function configure_dovecot()
 			
 			if(isset($ini_array['mail']['mailbox_virtual_uidgid_maps']) && $ini_array['mail']['mailbox_virtual_uidgid_maps'] == 'y') {
 				$virtual_transport = 'lmtp:unix:private/dovecot-lmtp';
+				$configure_lmtp = true;
 			}
 		}
 
@@ -114,7 +117,10 @@ public function configure_dovecot()
 			}
 		}
 		
-		
+		//* dovecot-lmtpd
+		if($configure_lmtp) {
+			replaceLine($config_dir.'/'.$configfile, 'protocols = imap pop3', 'protocols = imap pop3 lmtp', 1, 0);
+		}
 
 		//* dovecot-sql.conf
 		$configfile = 'dovecot-sql.conf';
diff --git a/install/dist/lib/fedora.lib.php b/install/dist/lib/fedora.lib.php
@@ -334,6 +334,8 @@ public function configure_dovecot()
 		global $conf;
 
 		$virtual_transport = 'dovecot';
+
+		$configure_lmtp = false;
 		
 		// check if virtual_transport must be changed
 		if ($this->is_update) {
@@ -343,6 +345,7 @@ public function configure_dovecot()
 			
 			if(isset($ini_array['mail']['mailbox_virtual_uidgid_maps']) && $ini_array['mail']['mailbox_virtual_uidgid_maps'] == 'y') {
 				$virtual_transport = 'lmtp:unix:private/dovecot-lmtp';
+				$configure_lmtp = true;
 			}
 		}
 
@@ -415,6 +418,11 @@ public function configure_dovecot()
 			}
 		}
 
+		//* dovecot-lmtpd
+		if($configure_lmtp) {
+			replaceLine($config_dir.'/'.$configfile, 'protocols = imap pop3', 'protocols = imap pop3 lmtp', 1, 0);
+		}
+
 		//* dovecot-sql.conf
 		$configfile = 'dovecot-sql.conf';
 		if(is_file("$config_dir/$configfile")){
diff --git a/install/dist/lib/gentoo.lib.php b/install/dist/lib/gentoo.lib.php
@@ -255,6 +255,8 @@ public function configure_dovecot()
 		global $conf;
 
 		$virtual_transport = 'dovecot';
+
+		$configure_lmtp = false;
 		
 		// check if virtual_transport must be changed
 		if ($this->is_update) {
@@ -264,6 +266,7 @@ public function configure_dovecot()
 			
 			if(isset($ini_array['mail']['mailbox_virtual_uidgid_maps']) && $ini_array['mail']['mailbox_virtual_uidgid_maps'] == 'y') {
 				$virtual_transport = 'lmtp:unix:private/dovecot-lmtp';
+				$configure_lmtp = true;
 			}
 		}
 
@@ -312,6 +315,11 @@ public function configure_dovecot()
 		$content = $this->get_template_file('dovecot.conf', true);
 		$this->write_config_file($configfile, $content);
 
+		//* dovecot-lmtpd
+		if($configure_lmtp) {
+			replaceLine($config_dir.'/'.$configfile, 'protocols = imap pop3', 'protocols = imap pop3 lmtp', 1, 0);
+		}
+
 		//* dovecot-sql.conf
 		$configfile = $config_dir.'/dovecot-sql.conf';
 		$content = $this->get_template_file('debian_dovecot-sql.conf', true, true);
diff --git a/install/dist/lib/opensuse.lib.php b/install/dist/lib/opensuse.lib.php
@@ -342,6 +342,8 @@ public function configure_dovecot()
 		global $conf;
 
 		$virtual_transport = 'dovecot';
+
+		$configure_lmtp = false;
 		
 		// check if virtual_transport must be changed
 		if ($this->is_update) {
@@ -351,6 +353,7 @@ public function configure_dovecot()
 			
 			if(isset($ini_array['mail']['mailbox_virtual_uidgid_maps']) && $ini_array['mail']['mailbox_virtual_uidgid_maps'] == 'y') {
 				$virtual_transport = 'lmtp:unix:private/dovecot-lmtp';
+				$configure_lmtp = true;
 			}
 		}
 
@@ -419,6 +422,11 @@ public function configure_dovecot()
 			}
 		}
 
+		//* dovecot-lmtpd
+		if($configure_lmtp) {
+			replaceLine($config_dir.'/'.$configfile, 'protocols = imap pop3', 'protocols = imap pop3 lmtp', 1, 0);
+		}
+
 		//* dovecot-sql.conf
 		$configfile = 'dovecot-sql.conf';
 		if(is_file("$config_dir/$configfile")){
diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
@@ -999,6 +999,8 @@ public function configure_dovecot() {
 		global $conf;
 		
 		$virtual_transport = 'dovecot';
+
+		$configure_lmtp = false;
 		
 		// check if virtual_transport must be changed
 		if ($this->is_update) {
@@ -1008,6 +1010,7 @@ public function configure_dovecot() {
 			
 			if(isset($ini_array['mail']['mailbox_virtual_uidgid_maps']) && $ini_array['mail']['mailbox_virtual_uidgid_maps'] == 'y') {
 				$virtual_transport = 'lmtp:unix:private/dovecot-lmtp';
+				$configure_lmtp = true;
 			}
 		}
 
@@ -1078,6 +1081,11 @@ public function configure_dovecot() {
 			}
 		}
 
+		//* dovecot-lmtpd
+		if($configure_lmtp) {
+			replaceLine($config_dir.'/'.$configfile, 'protocols = imap pop3', 'protocols = imap pop3 lmtp', 1, 0);
+		}
+
 		//* dovecot-sql.conf
 		$configfile = 'dovecot-sql.conf';
 		if(is_file($config_dir.'/'.$configfile)) {
diff --git a/install/tpl/debian6_dovecot2.conf.master b/install/tpl/debian6_dovecot2.conf.master
@@ -1,5 +1,5 @@
 listen = *,[::]
-protocols = imap pop3 lmtp
+protocols = imap pop3
 auth_mechanisms = plain login
 disable_plaintext_auth = no
 log_timestamp = "%Y-%m-%d %H:%M:%S "
@@ -61,4 +61,4 @@ protocol lda {
 protocol lmtp {
   postmaster_address = webmaster@localhost
   mail_plugins = quota sieve
-}
+}
diff --git a/install/tpl/debian_dovecot2.conf.master b/install/tpl/debian_dovecot2.conf.master
@@ -1,5 +1,5 @@
 listen = *,[::]
-protocols = imap pop3 lmtp
+protocols = imap pop3
 auth_mechanisms = plain login
 disable_plaintext_auth = no
 log_timestamp = "%Y-%m-%d %H:%M:%S "
@@ -62,4 +62,4 @@ protocol lda {
 protocol lmtp {
   postmaster_address = webmaster@localhost
   mail_plugins = quota sieve
-}
+}
diff --git a/install/tpl/fedora_dovecot2.conf.master b/install/tpl/fedora_dovecot2.conf.master
@@ -1,5 +1,5 @@
 listen = *,[::]
-protocols = imap pop3 lmtp
+protocols = imap pop3
 auth_mechanisms = plain login
 disable_plaintext_auth = no
 log_timestamp = "%Y-%m-%d %H:%M:%S "
diff --git a/install/tpl/opensuse_dovecot2.conf.master b/install/tpl/opensuse_dovecot2.conf.master
@@ -1,5 +1,5 @@
 listen = *,[::]
-protocols = imap pop3 lmtp
+protocols = imap pop3
 auth_mechanisms = plain login
 disable_plaintext_auth = no
 log_timestamp = "%Y-%m-%d %H:%M:%S "
@@ -59,4 +59,4 @@ protocol lda {
 protocol lmtp {
   postmaster_address = webmaster@localhost
   mail_plugins = quota sieve
-}
+}
diff --git a/server/plugins-available/postfix_server_plugin.inc.php b/server/plugins-available/postfix_server_plugin.inc.php
@@ -166,15 +166,20 @@ function update($event_name, $data) {
 			if($app->system->is_installed('dovecot')) {
 				exec("postconf -e 'virtual_transport = lmtp:unix:private/dovecot-lmtp'");
 				exec('postfix reload');
+				$app->system->replaceLine("/etc/dovecot/dovecot.conf", "protocols = imap pop3", "protocols = imap pop3 lmtp");
+				exec($conf['init_scripts'] . '/' . 'dovecot restart');
 			}
 		}
 		else {
 			// If dovecot switch to dovecot
 			if($app->system->is_installed('dovecot')) {
 				exec("postconf -e 'virtual_transport = dovecot'");
 				exec('postfix reload');
+				$app->system->replaceLine("/etc/dovecot/dovecot.conf", "protocols = imap pop3 lmtp", "protocols = imap pop3");
+				exec($conf['init_scripts'] . '/' . 'dovecot restart');
 			}
 		}
+print_r($mail_config);
 
 		exec("postconf -e 'mailbox_size_limit = ".intval($mail_config['mailbox_size_limit']*1024*1024)."'");
 		exec("postconf -e 'message_size_limit = ".intval($mail_config['message_size_limit']*1024*1024)."'");

Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,8 @@ public function configure_dovecot()`
`35`	`35`	`global $conf;`
`36`	`36`
`37`	`37`	`$virtual_transport = 'dovecot';`
	`38`	`+`
	`39`	`+ $configure_lmtp = false;`
`38`	`40`
`39`	`41`	`// check if virtual_transport must be changed`
`40`	`42`	`if ($this->is_update) {`
`@@ -44,6 +46,7 @@ public function configure_dovecot()`
`44`	`46`
`45`	`47`	`if(isset($ini_array['mail']['mailbox_virtual_uidgid_maps']) && $ini_array['mail']['mailbox_virtual_uidgid_maps'] == 'y') {`
`46`	`48`	`$virtual_transport = 'lmtp:unix:private/dovecot-lmtp';`
	`49`	`+ $configure_lmtp = true;`
`47`	`50`	`}`
`48`	`51`	`}`
`49`	`52`
`@@ -114,7 +117,10 @@ public function configure_dovecot()`
`114`	`117`	`}`
`115`	`118`	`}`
`116`	`119`
`117`		`-`
	`120`	`+ //* dovecot-lmtpd`
	`121`	`+ if($configure_lmtp) {`
	`122`	`+ replaceLine($config_dir.'/'.$configfile, 'protocols = imap pop3', 'protocols = imap pop3 lmtp', 1, 0);`
	`123`	`+ }`
`118`	`124`
`119`	`125`	`//* dovecot-sql.conf`
`120`	`126`	`$configfile = 'dovecot-sql.conf';`
Original file line number	Diff line number	Diff line change
`@@ -334,6 +334,8 @@ public function configure_dovecot()`
`334`	`334`	`global $conf;`
`335`	`335`
`336`	`336`	`$virtual_transport = 'dovecot';`
	`337`	`+`
	`338`	`+ $configure_lmtp = false;`
`337`	`339`
`338`	`340`	`// check if virtual_transport must be changed`
`339`	`341`	`if ($this->is_update) {`
`@@ -343,6 +345,7 @@ public function configure_dovecot()`
`343`	`345`
`344`	`346`	`if(isset($ini_array['mail']['mailbox_virtual_uidgid_maps']) && $ini_array['mail']['mailbox_virtual_uidgid_maps'] == 'y') {`
`345`	`347`	`$virtual_transport = 'lmtp:unix:private/dovecot-lmtp';`
	`348`	`+ $configure_lmtp = true;`
`346`	`349`	`}`
`347`	`350`	`}`
`348`	`351`
`@@ -415,6 +418,11 @@ public function configure_dovecot()`
`415`	`418`	`}`
`416`	`419`	`}`
`417`	`420`
	`421`	`+ //* dovecot-lmtpd`
	`422`	`+ if($configure_lmtp) {`
	`423`	`+ replaceLine($config_dir.'/'.$configfile, 'protocols = imap pop3', 'protocols = imap pop3 lmtp', 1, 0);`
	`424`	`+ }`
	`425`	`+`
`418`	`426`	`//* dovecot-sql.conf`
`419`	`427`	`$configfile = 'dovecot-sql.conf';`
`420`	`428`	`if(is_file("$config_dir/$configfile")){`
Original file line number	Diff line number	Diff line change
`@@ -342,6 +342,8 @@ public function configure_dovecot()`
`342`	`342`	`global $conf;`
`343`	`343`
`344`	`344`	`$virtual_transport = 'dovecot';`
	`345`	`+`
	`346`	`+ $configure_lmtp = false;`
`345`	`347`
`346`	`348`	`// check if virtual_transport must be changed`
`347`	`349`	`if ($this->is_update) {`
`@@ -351,6 +353,7 @@ public function configure_dovecot()`
`351`	`353`
`352`	`354`	`if(isset($ini_array['mail']['mailbox_virtual_uidgid_maps']) && $ini_array['mail']['mailbox_virtual_uidgid_maps'] == 'y') {`
`353`	`355`	`$virtual_transport = 'lmtp:unix:private/dovecot-lmtp';`
	`356`	`+ $configure_lmtp = true;`
`354`	`357`	`}`
`355`	`358`	`}`
`356`	`359`
`@@ -419,6 +422,11 @@ public function configure_dovecot()`
`419`	`422`	`}`
`420`	`423`	`}`
`421`	`424`
	`425`	`+ //* dovecot-lmtpd`
	`426`	`+ if($configure_lmtp) {`
	`427`	`+ replaceLine($config_dir.'/'.$configfile, 'protocols = imap pop3', 'protocols = imap pop3 lmtp', 1, 0);`
	`428`	`+ }`
	`429`	`+`
`422`	`430`	`//* dovecot-sql.conf`
`423`	`431`	`$configfile = 'dovecot-sql.conf';`
`424`	`432`	`if(is_file("$config_dir/$configfile")){`
Original file line number	Diff line number	Diff line change
`@@ -999,6 +999,8 @@ public function configure_dovecot() {`
`999`	`999`	`global $conf;`
`1000`	`1000`
`1001`	`1001`	`$virtual_transport = 'dovecot';`
	`1002`	`+`
	`1003`	`+ $configure_lmtp = false;`
`1002`	`1004`
`1003`	`1005`	`// check if virtual_transport must be changed`
`1004`	`1006`	`if ($this->is_update) {`
`@@ -1008,6 +1010,7 @@ public function configure_dovecot() {`
`1008`	`1010`
`1009`	`1011`	`if(isset($ini_array['mail']['mailbox_virtual_uidgid_maps']) && $ini_array['mail']['mailbox_virtual_uidgid_maps'] == 'y') {`
`1010`	`1012`	`$virtual_transport = 'lmtp:unix:private/dovecot-lmtp';`
	`1013`	`+ $configure_lmtp = true;`
`1011`	`1014`	`}`
`1012`	`1015`	`}`
`1013`	`1016`
`@@ -1078,6 +1081,11 @@ public function configure_dovecot() {`
`1078`	`1081`	`}`
`1079`	`1082`	`}`
`1080`	`1083`
	`1084`	`+ //* dovecot-lmtpd`
	`1085`	`+ if($configure_lmtp) {`
	`1086`	`+ replaceLine($config_dir.'/'.$configfile, 'protocols = imap pop3', 'protocols = imap pop3 lmtp', 1, 0);`
	`1087`	`+ }`
	`1088`	`+`
`1081`	`1089`	`//* dovecot-sql.conf`
`1082`	`1090`	`$configfile = 'dovecot-sql.conf';`
`1083`	`1091`	`if(is_file($config_dir.'/'.$configfile)) {`
Original file line number	Diff line number	Diff line change
`@@ -166,15 +166,20 @@ function update($event_name, $data) {`
`166`	`166`	`if($app->system->is_installed('dovecot')) {`
`167`	`167`	`exec("postconf -e 'virtual_transport = lmtp:unix:private/dovecot-lmtp'");`
`168`	`168`	`exec('postfix reload');`
	`169`	`+ $app->system->replaceLine("/etc/dovecot/dovecot.conf", "protocols = imap pop3", "protocols = imap pop3 lmtp");`
	`170`	`+ exec($conf['init_scripts'] . '/' . 'dovecot restart');`
`169`	`171`	`}`
`170`	`172`	`}`
`171`	`173`	`else {`
`172`	`174`	`// If dovecot switch to dovecot`
`173`	`175`	`if($app->system->is_installed('dovecot')) {`
`174`	`176`	`exec("postconf -e 'virtual_transport = dovecot'");`
`175`	`177`	`exec('postfix reload');`
	`178`	`+ $app->system->replaceLine("/etc/dovecot/dovecot.conf", "protocols = imap pop3 lmtp", "protocols = imap pop3");`
	`179`	`+ exec($conf['init_scripts'] . '/' . 'dovecot restart');`
`176`	`180`	`}`
`177`	`181`	`}`
	`182`	`+print_r($mail_config);`
`178`	`183`
`179`	`184`	`exec("postconf -e 'mailbox_size_limit = ".intval($mail_config['mailbox_size_limit']10241024)."'");`
`180`	`185`	`exec("postconf -e 'message_size_limit = ".intval($mail_config['message_size_limit']10241024)."'");`