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

fixed last commit



See merge request !490

Author: Till Brehm

install/dist/lib/fedora.lib.php

@@ -97,10 +97,10 @@ function configure_postfix($options = '')
 		$this->process_postfix_config('mysql-virtual_policy_greylist.cf');
 
 		//* mysql-virtual_gids.cf.master
-		$this->process_postfix_config('mysql-virtual_gids.cf.master.cf');
+		$this->process_postfix_config('mysql-virtual_gids.cf');
 
 		//* mysql-virtual_uids.cf
-		$this->process_postfix_config('mysql-virtual_uids.cf.master.cf');
+		$this->process_postfix_config('mysql-virtual_uids.cf');
 
 		//* postfix-dkim
 		$full_file_name=$config_dir.'/tag_as_originating.re';

install/dist/lib/opensuse.lib.php

@@ -94,10 +94,10 @@ function configure_postfix($options = '')
 		$this->process_postfix_config('mysql-virtual_policy_greylist.cf');
 
 		//* mysql-virtual_gids.cf.master
-		$this->process_postfix_config('mysql-virtual_gids.cf.master.cf');
+		$this->process_postfix_config('mysql-virtual_gids.cf');
 
 		//* mysql-virtual_uids.cf
-		$this->process_postfix_config('mysql-virtual_uids.cf.master.cf');
+		$this->process_postfix_config('mysql-virtual_uids.cf');
 
 		//* postfix-dkim
 		$full_file_name=$config_dir.'/tag_as_originating.re';

install/lib/installer_base.lib.php

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