Skip to content

Commit ac28b53

Browse files
committed
Removed message from installer.
1 parent 4be8f77 commit ac28b53

File tree

1 file changed

+2
-7
lines changed

1 file changed

+2
-7
lines changed

install/lib/installer_base.lib.php

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ public function find_installed_apps() {
123123
if(is_installed('courierlogger')) $conf['courier']['installed'] = true;
124124
if(is_installed('dovecot')) $conf['dovecot']['installed'] = true;
125125
if(is_installed('saslauthd')) $conf['saslauthd']['installed'] = true;
126-
if(is_installed('amavisd-new')) $conf['amavis']['installed'] = true;
126+
if(is_installed('amavisd-new') || is_installed('amavisd')) $conf['amavis']['installed'] = true;
127127
if(is_installed('clamdscan')) $conf['clamav']['installed'] = true;
128128
if(is_installed('pure-ftpd') || is_installed('pure-ftpd-wrapper')) $conf['pureftpd']['installed'] = true;
129129
if(is_installed('mydns') || is_installed('mydns-ng')) $conf['mydns']['installed'] = true;
@@ -924,12 +924,7 @@ public function configure_amavis() {
924924
$postconf_commands = array ();
925925

926926
// Check for amavisd -> pure webserver with postfix for mailing without antispam
927-
// Check for different names
928-
system('which amavisd-new', $retval); // Debian, Ubuntu, ?
929-
if ($retval !== 0){
930-
system('which amavisd', $retval); // CentOS
931-
}
932-
if ($retval === 0) {
927+
if ($conf['amavis']['installed']) {
933928
$postconf_commands[] = 'content_filter = amavis:[127.0.0.1]:10024';
934929
$postconf_commands[] = 'receive_override_options = no_address_mappings';
935930
}

0 commit comments

Comments
 (0)