Drop some old dev sites

[chef.git] / cookbooks / exim / templates / default / exim4.conf.erb

diff --git a/cookbooks/exim/templates/default/exim4.conf.erb b/cookbooks/exim/templates/default/exim4.conf.erb
index b5360c5844a307a3adeb3aa69c9fb13d6815a2f4..16e4e56d70213e1b6e0a737a16a487c1c0f80b46 100644 (file)
--- a/cookbooks/exim/templates/default/exim4.conf.erb
+++ b/cookbooks/exim/templates/default/exim4.conf.erb
@@ -371,7 +371,7 @@ acl_check_rcpt:
 
   deny    message       = Restricted characters in address
           domains       = !+local_domains
 
   deny    message       = Restricted characters in address
           domains       = !+local_domains

-          local_parts   = ^[./|] : ^.*[@%!] : ^.*/\\.\\./
+          local_parts   = ^[./|] : ^.*[@!] : ^.*/\\.\\./

   #############################################################################
 
   # Accept mail to postmaster in any local domain, regardless of the source,
   #############################################################################
 
   # Accept mail to postmaster in any local domain, regardless of the source,


@@ -529,7 +529,7 @@ begin routers
 
 system_aliases:
   driver = redirect
 
 system_aliases:
   driver = redirect

-  domains = +local_domains
+  domains = !noreply.openstreetmap.org : +local_domains

   allow_fail
   allow_defer
   data = ${lookup{$local_part}lsearch{/etc/aliases}}
   allow_fail
   allow_defer
   data = ${lookup{$local_part}lsearch{/etc/aliases}}