From e7516a1fbb178e06a898c6a8352b73b5b956f5b7 Mon Sep 17 00:00:00 2001 From: Carsten Schoene Date: Fri, 27 Dec 2013 23:02:38 +0100 Subject: [PATCH] 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. --- install/autoupdate.php | 6 ++++-- install/install.php | 6 ++++-- install/update.php | 6 ++++-- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/install/autoupdate.php b/install/autoupdate.php index c716d1a76..5913974ab 100644 --- a/install/autoupdate.php +++ b/install/autoupdate.php @@ -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'); diff --git a/install/install.php b/install/install.php index 9add1b3c6..75a8b70dd 100644 --- a/install/install.php +++ b/install/install.php @@ -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'); diff --git a/install/update.php b/install/update.php index 2788998dc..249c67f82 100644 --- a/install/update.php +++ b/install/update.php @@ -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'); -- GitLab