add postfix version check, smtpd_relay_restrictions and stress adaptive behavior

add postfix version check

add stress adaptive behavior (syntax changes with postfix version 3.0)

add smtpd_relay_restrictions (postfix version 2.10)

Author: jnorell

install/lib/installer_base.lib.php

@@ -967,6 +967,11 @@ public function configure_postfix($options = '') {
 			$this->error("The postfix configuration directory '$config_dir' does not exist.");
 		}
 
+		//* Get postfix version
+		exec('postfix -d mail_version 2>&1', $out);
+		$postfix_version = preg_replace('/.*=\s*/', '', $out[0]);
+		unset($out);
+
 		//* mysql-virtual_domains.cf
 		$this->process_postfix_config('mysql-virtual_domains.cf');
 
@@ -1093,6 +1098,26 @@ public function configure_postfix($options = '') {
 		$postconf_tpl = strtr($postconf_tpl, $postconf_placeholders);
 		$postconf_commands = array_filter(explode("\n", $postconf_tpl)); // read and remove empty lines
 
+		//* Merge version-specific postfix config
+		if(version_compare($postfix_version , '2.5', '>=')) {
+		    $configfile = 'postfix_2-5.conf';
+		    $content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/'.$configfile.'.master', 'tpl/'.$configfile.'.master');
+		    $content = strtr($content, $postconf_placeholders);
+		    $postconf_commands = array_merge($postconf_commands, array_filter(explode("\n", $content)));
+		}
+		if(version_compare($postfix_version , '2.10', '>=')) {
+		    $configfile = 'postfix_2-10.conf';
+		    $content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/'.$configfile.'.master', 'tpl/'.$configfile.'.master');
+		    $content = strtr($content, $postconf_placeholders);
+		    $postconf_commands = array_merge($postconf_commands, array_filter(explode("\n", $content)));
+		}
+		if(version_compare($postfix_version , '3.0', '>=')) {
+		    $configfile = 'postfix_3-0.conf';
+		    $content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/'.$configfile.'.master', 'tpl/'.$configfile.'.master');
+		    $content = strtr($content, $postconf_placeholders);
+		    $postconf_commands = array_merge($postconf_commands, array_filter(explode("\n", $content)));
+		}
+
 		//* These postconf commands will be executed on installation only
 		if($this->is_update == false) {
 			$postconf_commands = array_merge($postconf_commands, array(

install/tpl/postfix_2-10.conf.master

@@ -0,0 +1,5 @@
+# Postfix configuration for version 2.10 and up
+smtpd_relay_restrictions = permit_mynetworks, permit_sasl_authenticated, reject_unauth_destination
+
+# This is supported in version 2.9, but lets not create another conf file for it
+address_verify_sender_ttl = 15686s

install/tpl/postfix_2-5.conf.master

@@ -0,0 +1,11 @@
+# Postfix configuration for version 2.5 and up
+in_flow_delay = ${stress?3}${stress:1}s
+smtp_connect_timeout = ${stress?10}${stress:30}s
+smtp_helo_timeout = ${stress?10}${stress:60}s
+smtp_mail_timeout = ${stress?10}${stress:60}s
+smtpd_error_sleep_time = ${stress?1}${stress:2}s
+smtpd_hard_error_limit = ${stress?1}${stress:10}
+smtpd_recipient_overshoot_limit = ${stress?60}${stress:600}
+smtpd_soft_error_limit = ${stress?2}${stress:5}
+smtpd_timeout = ${stress?10}${stress:60}s
+

install/tpl/postfix_3-0.conf.master

@@ -0,0 +1,11 @@
+# Postfix configuration for version 3.0 and up
+in_flow_delay = ${stress?{3}:{1}}s
+smtp_connect_timeout = ${stress?{10}:{30}}s
+smtp_helo_timeout = ${stress?{10}:{60}}s
+smtp_mail_timeout = ${stress?{10}:{60}}s
+smtpd_error_sleep_time = ${stress?{1}:{2}}s
+smtpd_hard_error_limit = ${stress?{1}:{10}}
+smtpd_recipient_overshoot_limit = ${stress?{60}:{600}}
+smtpd_soft_error_limit = ${stress?{2}:{5}}
+smtpd_timeout = ${stress?{10}:{60}}s
+