Commit e7516a1f authored by Carsten's avatar Carsten

Only configure amavis when it's really installed.

configure_amavis() adds some extra lines to postfix's main.cf & master.cf
which are not required and are leading to malfunction when amavis is not installed.
parent 38184e1e
......@@ -228,8 +228,10 @@ if($conf['services']['mail'] == true) {
$inst->configure_spamassassin();
//** Configure Amavis
swriteln('Configuring Amavisd');
$inst->configure_amavis();
if($conf['amavis']['installed'] == true) {
swriteln('Configuring Amavisd');
$inst->configure_amavis();
}
//** Configure Getmail
swriteln('Configuring Getmail');
......
......@@ -216,8 +216,10 @@ if($install_mode == 'standard') {
$inst->configure_spamassassin();
//* Configure Amavis
swriteln('Configuring Amavisd');
$inst->configure_amavis();
if($conf['amavis']['installed'] == true) {
swriteln('Configuring Amavisd');
$inst->configure_amavis();
}
//* Configure Getmail
swriteln('Configuring Getmail');
......
......@@ -289,8 +289,10 @@ if($reconfigure_services_answer == 'yes') {
$inst->configure_spamassassin();
//** Configure Amavis
swriteln('Configuring Amavisd');
$inst->configure_amavis();
if($conf['amavis']['installed'] == true) {
swriteln('Configuring Amavisd');
$inst->configure_amavis();
}
//** Configure Getmail
swriteln('Configuring Getmail');
......
Markdown is supported
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