make dwmw2@ and postmaster@ more easily redirectable

diff --git a/master b/master
index 4650221d37fc1501529e8c877b8bc6b445ef7416..f5005de5eb28e1d7a14b47609f4731687f161345 100644 (file)
--- a/master
+++ b/master
@@ -81,6 +81,7 @@ domainlist relay_domains = !+virtual_domains : partial1-lsearch;CLUSTER/relay-do
 # users so much mail, and has fairly decent checks of its own.
 hostlist trust_hosts = pentafluge.infradead.org : \
                       baythorne.infradead.org : \
+                      twosheds.infradead.org : \
                       canuck.infradead.org : \
                       phoenix.infradead.org : \
                       bombadil.infradead.org : \
@@ -152,7 +153,7 @@ received_header_text = "Received: \
          id ${message_id}\
          ${if def:received_for {\n\tfor $received_for}}"
 
-freeze_tell = postmaster@baythorne.infradead.org
+freeze_tell = postmaster@infradead.org
 allow_domain_literals
 
 # av_scanner = sophie:/var/run/sophie
@@ -204,15 +205,15 @@ begin routers
 
 virtual_postmaster:
   driver = redirect
-  domains = +virtual_domains
+  domains = +virtual_domains : !infradead.org
   local_parts = postmaster:abuse
-  data = postmaster@baythorne.infradead.org
+  data = postmaster@infradead.org
 
 virtual_dwmw2:
   driver = redirect
-  domains = +virtual_domains
+  domains = +virtual_domains : !infradead.org
   local_parts = dwmw2
-  data = dwmw2@baythorne.infradead.org
+  data = dwmw2@infradead.org
 
 
 # Mailman lists may be in 'virtual' domains, and require special handling.