From e7516a1fbb178e06a898c6a8352b73b5b956f5b7 Mon Sep 17 00:00:00 2001
From: Carsten Schoene <ispconfig-dev@j0ke.net>
Date: Fri, 27 Dec 2013 17:02:38 -0500
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 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/install/autoupdate.php b/install/autoupdate.php
index c716d1a..5913974 100644
--- a/install/autoupdate.php
+++ b/install/autoupdate.php
@@ -228,8 +228,10 @@
$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');
--
Gitblit v1.9.1