Commit 91a7ecbb authored by Marius Burkard's avatar Marius Burkard
Browse files

Merge branch 'develop' into 'develop'

wrong main.cf after install (Fixes #5963)

Closes #5963

See merge request ispconfig/ispconfig3!1352
parents 1adea00f d903931f
Pipeline #6828 passed with stage
in 21 seconds
......@@ -1458,7 +1458,7 @@ class installer_base {
}
$config_dir = $conf['postfix']['config_dir'];
$quoted_config_dir = preg_quote($config_dir, '/');
$quoted_config_dir = preg_quote($config_dir, '|');
$postfix_version = `postconf -d mail_version 2>/dev/null`;
$postfix_version = preg_replace( '/mail_version\s*=\s*(.*)\s*/', '$1', $postfix_version );
......@@ -1504,7 +1504,7 @@ class installer_base {
if ($configure_lmtp && $conf['mail']['content_filter'] === 'amavisd') {
for ($i = 0; isset($new_options[$i]); $i++) {
if ($new_options[$i] == 'reject_unlisted_recipient') {
array_splice($new_options, $i+1, 0, array("check_recipient_access proxy:mysql:${quoted_config_dir}/mysql-verify_recipients.cf"));
array_splice($new_options, $i+1, 0, array("check_recipient_access proxy:mysql:${config_dir}/mysql-verify_recipients.cf"));
break;
}
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment