Add a header if mail comes to packages.d.o with envelope to and from the

[mirror/dsa-puppet.git] / modules / exim / templates / eximconf.erb

diff --git a/modules/exim/templates/eximconf.erb b/modules/exim/templates/eximconf.erb
index cf5ff77..70ac448 100644 (file)
--- a/modules/exim/templates/eximconf.erb
+++ b/modules/exim/templates/eximconf.erb
@@ -609,7 +609,17 @@ out='
 end
 out
 %>
-
+<%=
+out=''
+if nodeinfo['packagesqamaster']
+  out='
+  warn    condition      = ${if eq {$acl_m_prf}{PackagesMail}}
+          condition      = ${if eq {$sender_address}{$local_part@$domain}}
+          message        = X-Packages-FromTo-Same: yes
+'
+end
+out
+%>
   deny    condition      = ${if eq {$acl_m_prf}{PopconMail}{no}{yes}}
           !verify        = sender
 
@@ -948,8 +958,8 @@ if nodeinfo['packagesmaster']
         !verify        = certificate
         !hosts         = +debianhosts
         condition      = ${if <{$message_size}{256000}}
-        condition      = ${if >{$spam_score_int}{65}}
         spam           = pkg_user : true
+        condition      = ${if >{$spam_score_int}{59}}
 '
 end
 out