Commit 9f65de0b authored by Marius Burkard's avatar Marius Burkard

Merge branch 'master' into 'stable-3.1'

Master



See merge request !273
parents b3e7785b 7927f098
...@@ -144,7 +144,7 @@ $conf['saslauthd']['init_script'] = 'saslauthd'; ...@@ -144,7 +144,7 @@ $conf['saslauthd']['init_script'] = 'saslauthd';
//* Amavisd //* Amavisd
$conf['amavis']['installed'] = false; // will be detected automatically during installation $conf['amavis']['installed'] = false; // will be detected automatically during installation
$conf['amavis']['config_dir'] = '/etc'; $conf['amavis']['config_dir'] = '/etc/amavisd';
$conf['amavis']['init_script'] = 'amavisd'; $conf['amavis']['init_script'] = 'amavisd';
//* ClamAV //* ClamAV
......
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