01tonythomas has uploaded a new change for review.
https://gerrit.wikimedia.org/r/161679
Change subject: Corrected the exim regex expression
......................................................................
Corrected the exim regex expression
While testing in beta, VERP addresses were generated of the type
wiki-testwiki-4-nc7l7s-v+dnpjc1ll363...@mediawiki-verp.wmflabs.org
which included a '+' in the last part. This skipped through the tests
and resulted in loops as '\w' regex checks for only numbers and
alphabets
Change-Id: Id9491e9ca4a00a98a5fd9f4014897b407e92f36e
---
M templates/exim/exim4.conf.SMTP_IMAP_MM.erb
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/79/161679/1
diff --git a/templates/exim/exim4.conf.SMTP_IMAP_MM.erb
b/templates/exim/exim4.conf.SMTP_IMAP_MM.erb
index 182a02f..26ca9c8 100644
--- a/templates/exim/exim4.conf.SMTP_IMAP_MM.erb
+++ b/templates/exim/exim4.conf.SMTP_IMAP_MM.erb
@@ -32,7 +32,7 @@
<% end -%>
OTRSQUERY=SELECT value0 FROM system_address WHERE
value0='${quote_mysql:$local_part@$domain}' AND valid_id=1;
-VERP_BOUNCE_LOCALPART_REGEXP = \N^wiki-\w+-\w+-\w+-\w+$\N
+VERP_BOUNCE_LOCALPART_REGEXP = \N^wiki-\w+-\w+-\w+-[+\w+$]\N
###############################
# Main configuration settings #
--
To view, visit https://gerrit.wikimedia.org/r/161679
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id9491e9ca4a00a98a5fd9f4014897b407e92f36e
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: 01tonythomas <01tonytho...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
