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

minor updates to postfix' amvis-service



See merge request !510

install/lib/installer_base.lib.php

@@ -1348,6 +1348,7 @@ class installer_base {
 		$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
 
 		if ($add_amavis || $add_amavis_10025 || $add_amavis_10027) {
 			//* backup master.cf

install/tpl/master_cf_amavis.master

@@ -2,4 +2,5 @@
 amavis unix - - - - 2 smtp
         -o smtp_data_done_timeout=1200
         -o smtp_send_xforward_command=yes
+		-o smtp_bind_address=