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.

Author: Carsten Schoene

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');

install/install.php

@@ -216,8 +216,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');

install/update.php

@@ -289,8 +289,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');