Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet

diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml
index 716bb2e3f7bb7a0fc2024a5dcd3f1206622c34f9..5ea87ee28e7b1badf96eb006fab72f7545642020 100644 (file)
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -77,22 +77,22 @@ footer:
   zelenka.debian.org: "Debian s390 porter system kindly provided by Zentrum fuer Informationsverarbeitung und Informationstechnik [zivit]"
 services:
   bugsmaster: rietz.debian.org
-  qamaster: merkel.debian.org
   mailrelay: spohr.debian.org
-  rtmaster: spohr.debian.org
   packagesmaster: powell.debian.org
   packagesqamaster: master.debian.org
+  qamaster: merkel.debian.org
+  rtmaster: spohr.debian.org
 host_settings:
   heavy_exim:
-    - raff.debian.org
-    - merkel.debian.org
-    - spohr.debian.org
     - draghi.debian.org
+    - klecker.debian.org
     - master.debian.org
+    - merkel.debian.org
+    - powell.debian.org
+    - raff.debian.org
     - ries.debian.org
     - rietz.debian.org
-    - klecker.debian.org
-    - powell.debian.org
+    - spohr.debian.org
   apache2_defaultconfig:
     - bellini.debian.org
     - carver.debian.org
@@ -126,18 +126,18 @@ host_settings:
     - lafayette.debian.org
     - malo.debian.org
     - murphy.debian.org
+    - paer.debian.org
     - praetorius.debian.org
     - puccini.debian.org
-    - paer.debian.org
   smarthost:
-    ancina.debian.org: mailout.debian.org
     allegri.debian.org: mailout.debian.org
+    ancina.debian.org: mailout.debian.org
     piatti.debian.org: mailout.debian.org
   mail_port:
-    ancina.debian.org: 2025
     allegri.debian.org: 2025
-    piatti.debian.org: 2025
+    ancina.debian.org: 2025
     kassia.debian.org: 587
+    piatti.debian.org: 2025
   reservedaddrs:
     ball.debian.org: "0.0.0.0/8 : 127.0.0.0/8 : 10.0.0.0/8 : 169.254.0.0/16 : 172.16.0.0/12 : 192.0.0.0/17 : 192.168.0.0/16 : 224.0.0.0/4 : 240.0.0.0/5 : 248.0.0.0/5"
 ---

diff --git a/modules/exim/templates/eximconf.erb b/modules/exim/templates/eximconf.erb
index 764e5feb2ec688cb01ca95db2292647bb02370a3..b3c251cba4fb1a46e2509f87ff683360974c757f 100644 (file)
--- a/modules/exim/templates/eximconf.erb
+++ b/modules/exim/templates/eximconf.erb
@@ -367,6 +367,13 @@ out
 
   accept  condition      = ${if eq {$acl_m_rprf}{}{no}{yes}}
 
+  warn    domains        = +virtual_domains
+          condition      = ${if exists {${extract{directory}{VDOMAINDATA}{${value}/contentinspectionaction}}}}
+          condition      = ${if eq{${lookup{$local_part}lsearch*{${extract{directory}{VDOMAINDATA}{${value}/contentinspectionaction}}}{$value}{}}}{markup}}
+          set acl_m_rprf = markup
+
+  accept  condition      = ${if eq {$acl_m_rprf}{}{no}{yes}}
+
   warn    condition      = ${if eq{${lookup{$local_part}cdb{/var/lib/misc/${primary_hostname}/mail-contentinspectionaction.cdb}{$value}{}}}{markup}}
           set acl_m_rprf = markup
 
@@ -377,6 +384,13 @@ out
 
   accept  condition      = ${if eq {$acl_m_rprf}{}{no}{yes}}
 
+  warn    domains        = +virtual_domains
+          condition      = ${if exists {${extract{directory}{VDOMAINDATA}{${value}/contentinspectionaction}}}}
+          condition      = ${if eq{${lookup{$local_part}lsearch*{${extract{directory}{VDOMAINDATA}{${value}/contentinspectionaction}}}{$value}{}}}{blackhole}}
+          set acl_m_rprf = blackhole
+
+  accept  condition      = ${if eq {$acl_m_rprf}{}{no}{yes}}
+
   warn    set acl_m_rprf = normal
 
   accept