Merge branch 'stable-3.1' into 'stable-3.1'

dovecot lmtp, quota-status and managesieve

See merge request ispconfig/ispconfig3!932

Author: Till Brehm

install/dist/lib/debian60.lib.php

@@ -33,11 +33,16 @@ class installer extends installer_base {
 	public function configure_dovecot()
 	{
 		global $conf;
-		
+	
 		$virtual_transport = 'dovecot';
 
 		$configure_lmtp = false;
-		
+
+		// use lmtp if installed
+		if($configure_lmtp = is_file('/usr/lib/dovecot/lmtp')) {
+			$virtual_transport = 'lmtp:unix:private/dovecot-lmtp';
+		}
+
 		// check if virtual_transport must be changed
 		if ($this->is_update) {
 			$tmp = $this->db->queryOneRecord("SELECT * FROM ?? WHERE server_id = ?", $conf["mysql"]["database"] . ".server", $conf['server_id']);
@@ -138,7 +143,7 @@ public function configure_dovecot()
 				}
 				//remove #2.3+ comment
 				$content = file_get_contents($config_dir.'/'.$configfile);
-				$content = str_replace('#2.3+','',$content);
+				$content = str_replace('#2.3+ ','',$content);
 				file_put_contents($config_dir.'/'.$configfile,$content);
 				unset($content);
 
@@ -155,11 +160,20 @@ public function configure_dovecot()
 			}
 		}
 
+		$dovecot_protocols = 'imap pop3';
+
 		//* dovecot-lmtpd
 		if($configure_lmtp) {
-			replaceLine($config_dir.'/'.$configfile, 'protocols = imap pop3', 'protocols = imap pop3 lmtp', 1, 0);
+			$dovecot_protocols .= ' lmtp';
+		}
+
+		//* dovecot-managesieved
+		if(is_file('/usr/lib/dovecot/managesieve')) {
+			$dovecot_protocols .= ' sieve';
 		}
 
+		replaceLine($config_dir.'/'.$configfile, 'protocols = imap pop3', "protocols = $dovecot_protocols", 1, 0);
+
 		//* dovecot-sql.conf
 		$configfile = 'dovecot-sql.conf';
 		if(is_file($config_dir.'/'.$configfile)){

install/lib/install.lib.php

@@ -471,29 +471,38 @@ function rf($file){
 }
 
 function wf($file, $content){
-	mkdirs(dirname($file));
+	if(!$ret_val = mkdirs(dirname($file))) return false;
 	if(!$fp = fopen($file, 'wb')){
 		ilog('WARNING: could not open file '.$file);
+		// implicitly returned false because the following fwrite and fclose both fail,
+		// but to be explicit:
+		$ret_val = false;
 	}
-	fwrite($fp, $content);
-	fclose($fp);
+	fwrite($fp, $content) or $ret_val = false;
+	fclose($fp) or $ret_val = false;
+	return $ret_val;
 }
 
 function af($file, $content){
-	mkdirs(dirname($file));
+	if(!$ret_val = mkdirs(dirname($file))) return false;
 	if(!$fp = fopen($file, 'ab')){
 		ilog('WARNING: could not open file '.$file);
+		$ret_val = false;
 	}
-	fwrite($fp, $content);
-	fclose($fp);
+	fwrite($fp, $content) or $ret_val = false;
+	fclose($fp) or $ret_val = false;
+	return $ret_val;
 }
 
 function aftsl($file, $content){
+	$ret_val = true;
 	if(!$fp = fopen($file, 'ab')){
 		ilog('WARNING: could not open file '.$file);
+		$ret_val = false;
 	}
-	fwrite($fp, $content);
-	fclose($fp);
+	fwrite($fp, $content) or $ret_val = false;
+	fclose($fp) or $ret_val = false;
+	return $ret_val;
 }
 
 function unix_nl($input){

install/lib/installer_base.lib.php

@@ -864,7 +864,7 @@ public function get_postfix_service($service, $type) {
 				exec ("postconf -M $service.$type 2> /dev/null", $out, $ret);
 			}
 			$postfix_service = @($out[0]=='')?false:true;
-        } else { //* fallback - Postfix < 2.9
+		} else { //* fallback - Postfix < 2.9
 			$content = rf($conf['postfix']['config_dir'].'/master.cf');
 			$regex = "/^((?!#)".$service.".*".$type.".*)$/m"; 
 			$postfix_service = @(preg_match($regex, $content))?true:false;
@@ -873,6 +873,68 @@ public function get_postfix_service($service, $type) {
 		return $postfix_service;
 	}
 
+	public function remove_postfix_service( $service, $type ) {
+		global $conf;
+
+		// nothing to do if the service isn't even defined.
+		if (! $this->get_postfix_service( $service, $type ) ) {
+			return true;
+		}
+
+		$postfix_version = `postconf -d mail_version 2>/dev/null`;
+		$postfix_version = preg_replace( '/mail_version\s*=\s*(.*)\s*/', '$1', $postfix_version );
+
+		if ( version_compare( $postfix_version, '2.11', '>=' ) ) {
+
+			exec("postconf -X -M $service/$type 2> /dev/null", $out, $ret);
+
+			# reduce 3 or more newlines to 2
+			$content = rf($conf['postfix']['config_dir'].'/master.cf');
+			$content = preg_replace( '/(\r?\n){3,}/', '$1$1', $content );
+			wf( $conf['postfix']['config_dir'].'/master.cf', $content );
+
+		} else { //* fallback - Postfix < 2.11
+
+			if ( ! $cf = fopen( $conf['postfix']['config_dir'].'/master.cf', 'r' ) ) {
+				return false;
+			}
+
+			$out = "";
+			$reading_service = false;
+
+			while ( !feof( $cf ) ) {
+				$line = fgets( $cf );
+
+				if ( $reading_service ) {
+					# regex matches a new service or "empty" (whitespace) line
+					if ( preg_match( '/^([^\s#]+.*|\s*)$/', $line ) &&
+					   ! preg_match( '/^'.$service.'\s+'.$type.'/', $line ) ) {
+						$out .= $line;
+						$reading_service = false;
+					}
+
+					# $skipped_lines .= $line;
+
+				# regex matches definition matching service to be removed
+				} else if ( preg_match( '/^'.$service.'\s+'.$type.'/', $line ) ) {
+
+					$reading_service = true;
+					# $skipped_lines .= $line;
+
+				} else {
+					$out .= $line;
+				}
+			}
+			fclose( $cf );
+
+			$out = preg_replace( '/(\r?\n){3,}/', '$1$1', $out ); # reduce 3 or more newlines to 2
+
+			return wf( $conf['postfix']['config_dir'].'/master.cf', $out );
+		}
+
+		return true;
+	}
+
 	public function configure_postfix($options = '') {
 		global $conf,$autoinstall;
 		$cf = $conf['postfix'];
@@ -927,17 +989,26 @@ public function configure_postfix($options = '') {
 		//* mysql-virtual_uids.cf
 		$this->process_postfix_config('mysql-virtual_uids.cf');
 
+		// test if lmtp if available
+		$configure_lmtp = $this->get_postfix_service('lmtp','unix');
+
 		//* postfix-dkim
 		$filename='tag_as_originating.re';
 		$full_file_name=$config_dir.'/'.$filename;
 		if(is_file($full_file_name)) copy($full_file_name, $full_file_name.'~');
 		$content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/postfix-'.$filename.'.master', 'tpl/postfix-'.$filename.'.master');
+		if($configure_lmtp) {
+			$content = preg_replace('/amavis:/', 'lmtp:', $content);
+		}
 		wf($full_file_name, $content);
 
 		$filename='tag_as_foreign.re';
 		$full_file_name=$config_dir.'/'.$filename;
 		if(is_file($full_file_name)) copy($full_file_name, $full_file_name.'~');
 		$content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/postfix-'.$filename.'.master', 'tpl/postfix-'.$filename.'.master');
+		if($configure_lmtp) {
+			$content = preg_replace('/amavis:/', 'lmtp:', $content);
+		}
 		wf($full_file_name, $content);
 
 		//* Changing mode and group of the new created config files.
@@ -1233,11 +1304,16 @@ public function configure_courier() {
 
 	public function configure_dovecot() {
 		global $conf;
-		
+	
 		$virtual_transport = 'dovecot';
 
 		$configure_lmtp = false;
-		
+
+		// use lmtp if installed
+		if($configure_lmtp = is_file('/usr/lib/dovecot/lmtp')) {
+			$virtual_transport = 'lmtp:unix:private/dovecot-lmtp';
+		}
+
 		// check if virtual_transport must be changed
 		if ($this->is_update) {
 			$tmp = $this->db->queryOneRecord("SELECT * FROM ?? WHERE server_id = ?", $conf["mysql"]["database"] . ".server", $conf['server_id']);
@@ -1347,7 +1423,7 @@ public function configure_dovecot() {
 				}
 				//remove #2.3+ comment
 				$content = file_get_contents($config_dir.'/'.$configfile);
-				$content = str_replace('#2.3+','',$content);
+				$content = str_replace('#2.3+ ','',$content);
 				file_put_contents($config_dir.'/'.$configfile,$content);
 				unset($content);
 
@@ -1358,11 +1434,20 @@ public function configure_dovecot() {
 			}
 		}
 
+		$dovecot_protocols = 'imap pop3';
+
 		//* dovecot-lmtpd
 		if($configure_lmtp) {
-			replaceLine($config_dir.'/'.$configfile, 'protocols = imap pop3', 'protocols = imap pop3 lmtp', 1, 0);
+			$dovecot_protocols .= ' lmtp';
+		}
+
+		//* dovecot-managesieved
+		if(is_file('/usr/lib/dovecot/managesieve')) {
+			$dovecot_protocols .= ' sieve';
 		}
 
+		replaceLine($config_dir.'/'.$configfile, 'protocols = imap pop3', "protocols = $dovecot_protocols", 1, 0);
+
 		//* dovecot-sql.conf
 		$configfile = 'dovecot-sql.conf';
 		if(is_file($config_dir.'/'.$configfile)) {
@@ -1409,14 +1494,17 @@ public function configure_amavis() {
 
 		// TODO: chmod and chown on the config file
 
+		// test if lmtp if available
+		$configure_lmtp = $this->get_postfix_service('lmtp','unix');
 
 		// Adding the amavisd commands to the postfix configuration
 		// Add array for no error in foreach and maybe future options
 		$postconf_commands = array ();
 
 		// Check for amavisd -> pure webserver with postfix for mailing without antispam
 		if ($conf['amavis']['installed']) {
-			$postconf_commands[] = 'content_filter = amavis:[127.0.0.1]:10024';
+			$content_filter_service = ($configure_lmtp) ? 'lmtp' : 'amavis';
+			$postconf_commands[] = "content_filter = ${content_filter_service}:[127.0.0.1]:10024";
 			$postconf_commands[] = 'receive_override_options = no_address_mappings';
 		}
 
@@ -1432,11 +1520,16 @@ public function configure_amavis() {
 		$config_dir = $conf['postfix']['config_dir'];
 
 		// Adding amavis-services to the master.cf file if the service does not already exists
-		$add_amavis = !$this->get_postfix_service('amavis','unix');
-		$add_amavis_10025 = !$this->get_postfix_service('127.0.0.1:10025','inet');
-		$add_amavis_10027 = !$this->get_postfix_service('127.0.0.1:10027','inet');
+//		$add_amavis = !$this->get_postfix_service('amavis','unix');
+//		$add_amavis_10025 = !$this->get_postfix_service('127.0.0.1:10025','inet');
+//		$add_amavis_10027 = !$this->get_postfix_service('127.0.0.1:10027','inet');
 		//*TODO: check templates against existing postfix-services to make sure we use the template
 
+		// Or just remove the old service definitions and add them again?
+		$add_amavis = $this->remove_postfix_service('amavis','unix');
+		$add_amavis_10025 = $this->remove_postfix_service('127.0.0.1:10025','inet');
+		$add_amavis_10027 = $this->remove_postfix_service('127.0.0.1:10027','inet');
+
 		if ($add_amavis || $add_amavis_10025 || $add_amavis_10027) {
 			//* backup master.cf
 			if(is_file($config_dir.'/master.cf')) copy($config_dir.'/master.cf', $config_dir.'/master.cf~');

install/sql/incremental/upd_dev_collection.sql

@@ -26,3 +26,9 @@ ALTER TABLE `mail_user`
 
 -- doveadm should be enabled for all mailboxes
 UPDATE `mail_user` set `disabledoveadm` = 'n';
+
+-- add disablequota-status for quota-status policy daemon
+ALTER TABLE `mail_user` ADD `disablequota-status` ENUM('n','y') CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT 'n' AFTER `disabledoveadm`;
+
+-- add disableindexer-worker for solr search
+ALTER TABLE `mail_user` ADD `disableindexer-worker` ENUM('n','y') CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT 'n' AFTER `disablequota-status`;

install/sql/ispconfig3.sql

@@ -1062,6 +1062,8 @@ CREATE TABLE `mail_user` (
   `disablelda` enum('n','y') NOT NULL default 'n',
   `disablelmtp` enum('n','y') NOT NULL default 'n',
   `disabledoveadm` enum('n','y') NOT NULL default 'n',
+  `disablequota-status` enum('n','y') NOT NULL default 'n',
+  `disableindexer-worker` enum('n','y') NOT NULL default 'n',
   `last_quota_notification` date NULL default NULL,
   `backup_interval` VARCHAR( 255 ) NOT NULL default 'none',
   `backup_copies` INT NOT NULL DEFAULT '1',

install/tpl/debian6_dovecot.conf.master

@@ -57,7 +57,13 @@ plugin {
   # the maildir quota does not need to be set.
   # You do not need: quota = maildir
 
+  # no longer needed, as 'sieve' is in userdb extra fields:
   sieve=/var/vmail/%d/%n/.sieve
+
+  sieve_after=/var/vmail/%d/%n/.ispconfig.sieve
+  sieve_max_script_size = 2M
+  sieve_max_actions = 100
+  sieve_max_redirects = 25
 }
 
 

install/tpl/debian6_dovecot2.conf.master

@@ -10,6 +10,7 @@ ssl_dh = </etc/dovecot/dh.pem
 ssl_protocols = !SSLv2 !SSLv3
 ssl_min_protocol = TLSv1
 mail_max_userip_connections = 100
+mail_plugins = quota
 passdb {
   args = /etc/dovecot/dovecot-sql.conf
   driver = sql
@@ -23,7 +24,13 @@ userdb {
 }
 plugin {
   quota = dict:user::file:/var/vmail/%d/%n/.quotausage
+
+  # no longer needed, as 'sieve' is in userdb extra fields:
   sieve=/var/vmail/%d/%n/.sieve
+
+  sieve_after=/var/vmail/%d/%n/.ispconfig.sieve
+  sieve_max_script_size = 2M
+  sieve_max_actions = 100
   sieve_max_redirects = 25
 }
 service auth {
@@ -49,6 +56,7 @@ service lmtp {
 #   process_min_avail = 5
   }
 }
+lmtp_rcpt_check_quota = yes
 service imap-login {
   client_limit = 1000
   process_limit = 512
@@ -83,3 +91,39 @@ protocol lmtp {
 #2.3+     }
 #2.3+ }
 
+service quota-status {
+  executable = quota-status -p postfix
+  unix_listener /var/spool/postfix/private/quota-status {
+    group = postfix
+    mode = 0660
+    user = postfix
+  }
+  client_limit = 1
+}
+plugin {
+  quota_status_success = DUNNO
+  quota_status_nouser = DUNNO
+  quota_status_overquota = "552 5.2.2 Mailbox is full"
+}
+
+imap_capability=+SEPCIAL-USE XLIST
+namespace inbox {
+  inbox = yes
+  separator = .
+  mailbox Drafts {
+    special_use = \Drafts
+  }
+  mailbox Junk {
+    special_use = \Junk
+  }
+  mailbox Sent {
+    special_use = \Sent
+  }
+  mailbox "Sent Messages" {
+    special_use = \Sent
+  }
+  mailbox Trash {
+    special_use = \Trash
+  }
+}
+