From 24e308b93281966afeaa419de82badc93c082865 Mon Sep 17 00:00:00 2001
From: Jesse Norell <jesse@kci.net>
Date: Thu, 8 Oct 2020 11:20:35 -0600
Subject: [PATCH] copy configure_postfix settings from installer_base
---
install/dist/lib/fedora.lib.php | 14 ++++++++++++++
install/dist/lib/gentoo.lib.php | 14 ++++++++++++++
install/dist/lib/opensuse.lib.php | 14 ++++++++++++++
3 files changed, 42 insertions(+)
diff --git a/install/dist/lib/fedora.lib.php b/install/dist/lib/fedora.lib.php
index 2d31b89bbd..683591d58f 100644
--- a/install/dist/lib/fedora.lib.php
+++ b/install/dist/lib/fedora.lib.php
@@ -163,8 +163,19 @@ class installer_dist extends installer_base {
$stress_adaptive_placeholder = '#{stress_adaptive} ';
$stress_adaptive = (isset($server_ini_array['mail']['stress_adaptive']) && ($server_ini_array['mail']['stress_adaptive'] == 'y')) ? '' : $stress_adaptive_placeholder;
+ $reject_unknown_client_hostname='';
+ if (isset($server_ini_array['mail']['reject_unknown']) && ($server_ini_array['mail']['reject_unknown'] == 'client' || $server_ini_array['mail']['reject_unknown'] == 'client_helo')) {
+ $reject_unknown_client_hostname=',reject_unknown_client_hostname';
+ }
+ $reject_unknown_helo_hostname='';
+ if ((!isset($server_ini_array['mail']['reject_unknown'])) || $server_ini_array['mail']['reject_unknown'] == 'helo' || $server_ini_array['mail']['reject_unknown'] == 'client_helo') {
+ $reject_unknown_helo_hostname=',reject_unknown_helo_hostname';
+ }
+
unset($server_ini_array);
+ $myhostname = str_replace('.','\.',$conf['hostname']);
+
$postconf_placeholders = array('{config_dir}' => $config_dir,
'{vmail_mailbox_base}' => $cf['vmail_mailbox_base'],
'{vmail_userid}' => $cf['vmail_userid'],
@@ -173,7 +184,10 @@ class installer_dist extends installer_base {
'{greylisting}' => $greylisting,
'{reject_slm}' => $reject_sender_login_mismatch,
'{reject_aslm}' => $reject_authenticated_sender_login_mismatch,
+ '{myhostname}' => $myhostname,
$stress_adaptive_placeholder => $stress_adaptive,
+ '{reject_unknown_client_hostname}' => $reject_unknown_client_hostname,
+ '{reject_unknown_helo_hostname}' => $reject_unknown_helo_hostname,
);
$postconf_tpl = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/fedora_postfix.conf.master', 'tpl/fedora_postfix.conf.master');
diff --git a/install/dist/lib/gentoo.lib.php b/install/dist/lib/gentoo.lib.php
index 342a583fac..acd4dbcf61 100644
--- a/install/dist/lib/gentoo.lib.php
+++ b/install/dist/lib/gentoo.lib.php
@@ -112,8 +112,19 @@ class installer extends installer_base
$stress_adaptive_placeholder = '#{stress_adaptive} ';
$stress_adaptive = (isset($server_ini_array['mail']['stress_adaptive']) && ($server_ini_array['mail']['stress_adaptive'] == 'y')) ? '' : $stress_adaptive_placeholder;
+ $reject_unknown_client_hostname='';
+ if (isset($server_ini_array['mail']['reject_unknown']) && ($server_ini_array['mail']['reject_unknown'] == 'client' || $server_ini_array['mail']['reject_unknown'] == 'client_helo')) {
+ $reject_unknown_client_hostname=',reject_unknown_client_hostname';
+ }
+ $reject_unknown_helo_hostname='';
+ if ((!isset($server_ini_array['mail']['reject_unknown'])) || $server_ini_array['mail']['reject_unknown'] == 'helo' || $server_ini_array['mail']['reject_unknown'] == 'client_helo') {
+ $reject_unknown_helo_hostname=',reject_unknown_helo_hostname';
+ }
+
unset($server_ini_array);
+ $myhostname = str_replace('.','\.',$conf['hostname']);
+
$postconf_placeholders = array('{config_dir}' => $config_dir,
'{vmail_mailbox_base}' => $cf['vmail_mailbox_base'],
'{vmail_userid}' => $cf['vmail_userid'],
@@ -122,7 +133,10 @@ class installer extends installer_base
'{greylisting}' => $greylisting,
'{reject_slm}' => $reject_sender_login_mismatch,
'{reject_aslm}' => $reject_authenticated_sender_login_mismatch,
+ '{myhostname}' => $myhostname,
$stress_adaptive_placeholder => $stress_adaptive,
+ '{reject_unknown_client_hostname}' => $reject_unknown_client_hostname,
+ '{reject_unknown_helo_hostname}' => $reject_unknown_helo_hostname,
);
$postconf_tpl = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/gentoo_postfix.conf.master', 'tpl/gentoo_postfix.conf.master');
diff --git a/install/dist/lib/opensuse.lib.php b/install/dist/lib/opensuse.lib.php
index 07dd5cc690..cb145ea7df 100644
--- a/install/dist/lib/opensuse.lib.php
+++ b/install/dist/lib/opensuse.lib.php
@@ -174,8 +174,19 @@ class installer_dist extends installer_base {
$stress_adaptive_placeholder = '#{stress_adaptive} ';
$stress_adaptive = (isset($server_ini_array['mail']['stress_adaptive']) && ($server_ini_array['mail']['stress_adaptive'] == 'y')) ? '' : $stress_adaptive_placeholder;
+ $reject_unknown_client_hostname='';
+ if (isset($server_ini_array['mail']['reject_unknown']) && ($server_ini_array['mail']['reject_unknown'] == 'client' || $server_ini_array['mail']['reject_unknown'] == 'client_helo')) {
+ $reject_unknown_client_hostname=',reject_unknown_client_hostname';
+ }
+ $reject_unknown_helo_hostname='';
+ if ((!isset($server_ini_array['mail']['reject_unknown'])) || $server_ini_array['mail']['reject_unknown'] == 'helo' || $server_ini_array['mail']['reject_unknown'] == 'client_helo') {
+ $reject_unknown_helo_hostname=',reject_unknown_helo_hostname';
+ }
+
unset($server_ini_array);
+ $myhostname = str_replace('.','\.',$conf['hostname']);
+
$postconf_placeholders = array('{config_dir}' => $config_dir,
'{vmail_mailbox_base}' => $cf['vmail_mailbox_base'],
'{vmail_userid}' => $cf['vmail_userid'],
@@ -184,7 +195,10 @@ class installer_dist extends installer_base {
'{greylisting}' => $greylisting,
'{reject_slm}' => $reject_sender_login_mismatch,
'{reject_aslm}' => $reject_authenticated_sender_login_mismatch,
+ '{myhostname}' => $myhostname,
$stress_adaptive_placeholder => $stress_adaptive,
+ '{reject_unknown_client_hostname}' => $reject_unknown_client_hostname,
+ '{reject_unknown_helo_hostname}' => $reject_unknown_helo_hostname,
);
$postconf_tpl = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/opensuse_postfix.conf.master', 'tpl/opensuse_postfix.conf.master');
--
GitLab