Commit 327ed8ee authored by Marius Burkard's avatar Marius Burkard
Browse files

Merge branch...

Merge branch '6094-ignore-postfix_custom-and-dovecot_custom-config-files-in-conf-custom-check' into 'develop'

Resolve "Ignore postfix_custom and dovecot_custom config files in conf-custom check"

Closes #6094

See merge request ispconfig/ispconfig3!1436
parents 376b1df7 fd5edc4f
......@@ -473,12 +473,22 @@ function checkAndRenameCustomTemplates($default_prompt='no') {
'/usr/local/ispconfig/server/conf-custom/install',
);
$override_templates = array(
'postfix_custom.conf.master',
'dovecot_custom.conf.master',
);
$found_templates = array();
$found_override_templates = array();
foreach ($template_directories as $dir) {
if (!is_dir($dir)) { continue; }
foreach (glob("$dir/*.master") as $f) {
if (is_file($f)) {
$found_templates[] = $f;
if (in_array( basename($f), $override_templates )) {
$found_override_templates[] = $f;
} else {
$found_templates[] = $f;
}
}
}
}
......@@ -501,6 +511,11 @@ function checkAndRenameCustomTemplates($default_prompt='no') {
}
}
if (count($found_override_templates) > 0) {
echo "The following local config override templates were found, be sure to incorporate upstream changes if needed:\n\n";
echo implode("\n", $found_override_templates) . "\n\n";
}
return $ret;
}
......
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