Commit ac28b53f authored by tbrehm's avatar tbrehm

Removed message from installer.

parent 4be8f776
...@@ -123,7 +123,7 @@ class installer_base { ...@@ -123,7 +123,7 @@ class installer_base {
if(is_installed('courierlogger')) $conf['courier']['installed'] = true; if(is_installed('courierlogger')) $conf['courier']['installed'] = true;
if(is_installed('dovecot')) $conf['dovecot']['installed'] = true; if(is_installed('dovecot')) $conf['dovecot']['installed'] = true;
if(is_installed('saslauthd')) $conf['saslauthd']['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('clamdscan')) $conf['clamav']['installed'] = true;
if(is_installed('pure-ftpd') || is_installed('pure-ftpd-wrapper')) $conf['pureftpd']['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; if(is_installed('mydns') || is_installed('mydns-ng')) $conf['mydns']['installed'] = true;
...@@ -924,12 +924,7 @@ class installer_base { ...@@ -924,12 +924,7 @@ class installer_base {
$postconf_commands = array (); $postconf_commands = array ();
// Check for amavisd -> pure webserver with postfix for mailing without antispam // Check for amavisd -> pure webserver with postfix for mailing without antispam
// Check for different names if ($conf['amavis']['installed']) {
system('which amavisd-new', $retval); // Debian, Ubuntu, ?
if ($retval !== 0){
system('which amavisd', $retval); // CentOS
}
if ($retval === 0) {
$postconf_commands[] = 'content_filter = amavis:[127.0.0.1]:10024'; $postconf_commands[] = 'content_filter = amavis:[127.0.0.1]:10024';
$postconf_commands[] = 'receive_override_options = no_address_mappings'; $postconf_commands[] = 'receive_override_options = no_address_mappings';
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment