From ac28b53f1795d9299295a438ac16aa15a43a5b72 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Thu, 22 Sep 2011 08:46:47 -0400
Subject: [PATCH] Removed message from installer.
---
install/lib/installer_base.lib.php | 9 ++-------
1 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
index ef55210..fb4360c 100644
--- a/install/lib/installer_base.lib.php
+++ b/install/lib/installer_base.lib.php
@@ -123,7 +123,7 @@
if(is_installed('courierlogger')) $conf['courier']['installed'] = true;
if(is_installed('dovecot')) $conf['dovecot']['installed'] = true;
if(is_installed('saslauthd')) $conf['saslauthd']['installed'] = true;
- if(is_installed('amavisd-new')) $conf['amavis']['installed'] = true;
+ if(is_installed('amavisd-new') || is_installed('amavisd')) $conf['amavis']['installed'] = true;
if(is_installed('clamdscan')) $conf['clamav']['installed'] = true;
if(is_installed('pure-ftpd') || is_installed('pure-ftpd-wrapper')) $conf['pureftpd']['installed'] = true;
if(is_installed('mydns') || is_installed('mydns-ng')) $conf['mydns']['installed'] = true;
@@ -924,12 +924,7 @@
$postconf_commands = array ();
// Check for amavisd -> pure webserver with postfix for mailing without antispam
- // Check for different names
- system('which amavisd-new', $retval); // Debian, Ubuntu, ?
- if ($retval !== 0){
- system('which amavisd', $retval); // CentOS
- }
- if ($retval === 0) {
+ if ($conf['amavis']['installed']) {
$postconf_commands[] = 'content_filter = amavis:[127.0.0.1]:10024';
$postconf_commands[] = 'receive_override_options = no_address_mappings';
}
--
Gitblit v1.9.1