Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-05-13 3cf77b791fb646e5837dac63a2e8c06604771b1d

Merge branch 'master' into 'stable-3.1'

updated amavis-config



See merge request !340

 install/tpl/fedora_amavisd_conf.master

@@ -146,8 +146,8 @@

$myhostname = '{hostname}';

$notify_method  = 'smtp:[127.0.0.1]:10027';
$forward_method = 'smtp:[127.0.0.1]:10025';  # set to undef with milter!
$notify_method  = 'smtp:*:*';
$forward_method = 'smtp:*:*';  # set to undef with milter!

# $os_fingerprint_method = 'p0f:127.0.0.1:2345';  # to query p0f-analyzer.pl


 install/tpl/opensuse_amavisd_conf.master

@@ -145,8 +145,8 @@

$myhostname = 'linux-jfp8.site';

$notify_method  = 'smtp:[127.0.0.1]:10027';
$forward_method = 'smtp:[127.0.0.1]:10025';  # set to undef with milter!
$notify_method  = 'smtp:*:*';
$forward_method = 'smtp:*:*';  # set to undef with milter!

# $final_virus_destiny      = D_DISCARD;
# $final_banned_destiny     = D_BOUNCE;