]> git.donarmstrong.com Git - dsa-puppet.git/commitdiff
*sigh*
authorPeter Palfrader <peter@palfrader.org>
Fri, 24 Feb 2012 22:15:10 +0000 (23:15 +0100)
committerPeter Palfrader <peter@palfrader.org>
Fri, 24 Feb 2012 22:15:10 +0000 (23:15 +0100)
modules/exim/templates/eximconf.erb

index 97b96cb6652af61c63f2a4f0c47bea5a8f93a25a..575ad0c57512f4013738940de3e3faafad56f2c2 100644 (file)
@@ -716,8 +716,8 @@ check_recipient:
 <%- end -%>
 <%- if nodeinfo['rtmaster'] -%>
   warn    condition     = ${if eq{$acl_m_prf}{RTMail}}
-          set acl_m12   = ${if def:acl_m12 {$acl_m12} {${if or{{match{$local_part}{\N[^+]+\+\d+\N}}{match{$local_part}{\N[^+]+\+new\N}}{match{$local_part}{3520}}} {RTMailRecipientHasSubaddress}}}}
-  # temporary hack because weasel screwed up and gave people an rt-3520@ address, which doesn't really work normally.
+          set acl_m12   = ${if def:acl_m12 {$acl_m12} {${if or{{match{$local_part}{\N[^+]+\+\d+\N}}{match{$local_part}{\N[^+]+\+new\N}}{match{$local_part}{3520}}{match{$local_part}{3645}}} {RTMailRecipientHasSubaddress}}}}
+  # temporary hack because weasel screwed up and gave people an rt-3520@ address, which doesn't really work normally.  and rt-3645
   #set acl_m12  = ${if def:acl_m12 {$acl_m12} {${if or{{match{$local_part}{\N[^+]+\+\d+\N}}{match{$local_part}{\N[^+]+\+new\N}}} {RTMailRecipientHasSubaddress}}}}