X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fexim%2Ftemplates%2Feximconf.erb;h=d843e341abf39208fac5ce43cbb10e2ba7790271;hb=76bd84e8cb84a445026004bf75a37fb81906be92;hp=cf5ff779722123fafdb67e06d7e4254cc1f3d099;hpb=870583876b469a14cf284dbb5b65ca89b0d30c2d;p=mirror%2Fdsa-puppet.git

diff --git a/modules/exim/templates/eximconf.erb b/modules/exim/templates/eximconf.erb
index cf5ff7797..d843e341a 100644
--- a/modules/exim/templates/eximconf.erb
+++ b/modules/exim/templates/eximconf.erb
@@ -312,7 +312,7 @@ end
 out
 %>
 <%=
-out = ""
+out = ''
 if nodeinfo['packagesmaster']
   out = '
   warn    domains        = packages.debian.org
@@ -324,6 +324,7 @@ end
 out
 %>
 <%=
+out = ''
 if nodeinfo['packagesqamaster']
   out='
   warn    recipients     = owner@packages.qa.debian.org : postmaster@packages.qa.debian.org
@@ -609,7 +610,17 @@ out='
 end
 out
 %>
-
+<%=
+out=''
+if nodeinfo['packagesmaster']
+  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 +959,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
@@ -1567,7 +1578,6 @@ out
 begin retry
 
 debian.org	       *	   F,2h,10m; G,16h,2h,1.5; F,14d,8h
-*                      * senders=: F,2h,10m
 *                      rcpt_4xx    F,2h,5m;  F,4h,10m; F,4d,15m
 *                      *           F,2h,15m; G,16h,2h,1.5; F,4d,8h