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

Stable 3.1



See merge request !489

Author: Till Brehm

install/dist/lib/fedora.lib.php

@@ -96,6 +96,12 @@ function configure_postfix($options = '')
 		//* mysql-virtual_policy_greylist.cf
 		$this->process_postfix_config('mysql-virtual_policy_greylist.cf');
 
+		//* mysql-virtual_gids.cf.master
+		$this->process_postfix_config('mysql-virtual_gids.cf.master.cf');
+
+		//* mysql-virtual_uids.cf
+		$this->process_postfix_config('mysql-virtual_uids.cf.master.cf');
+
 		//* postfix-dkim
 		$full_file_name=$config_dir.'/tag_as_originating.re';
 		if(is_file($full_file_name)) {
@@ -182,7 +188,7 @@ function configure_postfix($options = '')
 		//if(!is_file('/var/lib/mailman/data/aliases')) touch('/var/lib/mailman/data/aliases');
 		if(is_file('/var/lib/mailman/data/aliases')) unlink('/var/lib/mailman/data/aliases');
 		if(!is_link('/var/lib/mailman/data/aliases')) symlink('/etc/mailman/aliases', '/var/lib/mailman/data/aliases');
-		if(!is_dir('/etc/mailman') mkdir('/etc/mailman');
+		if(!is_dir('/etc/mailman')) mkdir('/etc/mailman');
 		if(!is_file('/etc/mailman/aliases')) touch('/etc/mailman/aliases');
 		exec('postalias /var/lib/mailman/data/aliases');
 		if(!is_file('/etc/mailman/virtual-mailman')) touch('/etc/mailman/virtual-mailman');

install/dist/lib/opensuse.lib.php

@@ -93,6 +93,12 @@ function configure_postfix($options = '')
 		//* mysql-virtual_policy_greylist.cf
 		$this->process_postfix_config('mysql-virtual_policy_greylist.cf');
 
+		//* mysql-virtual_gids.cf.master
+		$this->process_postfix_config('mysql-virtual_gids.cf.master.cf');
+
+		//* mysql-virtual_uids.cf
+		$this->process_postfix_config('mysql-virtual_uids.cf.master.cf');
+
 		//* postfix-dkim
 		$full_file_name=$config_dir.'/tag_as_originating.re';
 		if(is_file($full_file_name)) {

install/lib/installer_base.lib.php

@@ -875,8 +875,14 @@ public function configure_postfix($options = '') {
 		//* mysql-virtual_outgoing_bcc.cf
 		$this->process_postfix_config('mysql-virtual_outgoing_bcc.cf');
 
-                //* mysql-virtual_policy_greylist.cf
-                $this->process_postfix_config('mysql-virtual_policy_greylist.cf');
+		//* mysql-virtual_policy_greylist.cf
+		$this->process_postfix_config('mysql-virtual_policy_greylist.cf');
+
+		//* mysql-virtual_gids.cf.master
+		$this->process_postfix_config('mysql-virtual_gids.cf.master.cf');
+
+		//* mysql-virtual_uids.cf
+		$this->process_postfix_config('mysql-virtual_uids.cf.master.cf');
 
 		//* postfix-dkim
 		$full_file_name=$config_dir.'/tag_as_originating.re';