get_template_vars: compute wl_bounce_relays, always include local fqdn

Backscatter filter should work out of the box as soon as pmg.spam.bounce_score > 0.

diff --git a/PMG/Config.pm b/PMG/Config.pm
index 108b4f41f73b79238ca2df0991101fc0068a2487..1f80ca26708334f56f8490bc5ab3566ff4ba6136 100755 (executable)
--- a/PMG/Config.pm
+++ b/PMG/Config.pm
@@ -1015,6 +1015,12 @@ sub get_template_vars {
     $vars->{dns}->{hostname} = $nodename;
     $vars->{dns}->{domain} = $resolv->{search};
 
+    my $wlbr = "$nodename.$resolv->{search}";
+    foreach my $r (PVE::Tools::split_list($vars->{pmg}->{spam}->{wl_bounce_relays})) {
+       $wlbr .= " $r"
+    }
+    $vars->{composed}->{wl_bounce_relays} = $wlbr;
+
     if (my $proxy = $vars->{pmg}->{admin}->{http_proxy}) {
        eval {
            my $uri = URI->new($proxy);

diff --git a/templates/local.cf.in b/templates/local.cf.in
index a4295f8a441beca57c23d7199b77f03ce30c1d3a..f974adb59471d88ae705a3d22527fe134e569301 100644 (file)
--- a/templates/local.cf.in
+++ b/templates/local.cf.in
@@ -20,8 +20,8 @@ skip_rbl_checks 1
 use_bayes [% pmg.spam.use_bayes %] 
 [% END %]
 
-[% IF pmg.spam.wl_bounce_relays %]
-whitelist_bounce_relays [% pmg.spam.wl_bounce_relays %]
+[% IF pmg.spam.bounce_score %]
+whitelist_bounce_relays [% composed.wl_bounce_relays %]
 score ANY_BOUNCE_MESSAGE [% pmg.spam.bounce_score %]
 [% END %]