01tonythomas has uploaded a new change for review.
https://gerrit.wikimedia.org/r/141287
Change subject: Removed primary hostname to support custom Return-Path
......................................................................
Removed primary hostname to support custom Return-Path
* Required to implement VERP
* Now, Return-Path is fetched from the $headers[ 'Return-Path' ]
* Helps in identifying failing recipients
Needed By: I9463ae33ae327405725ea9693d45ad61b8ecf798
Change-Id: Ibb88a6cfd762f834340f6362fe70ea7e6c838b37
---
M templates/mail/exim4.minimal.erb
1 file changed, 5 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/87/141287/1
diff --git a/templates/mail/exim4.minimal.erb b/templates/mail/exim4.minimal.erb
index b0e37cb..0116796 100644
--- a/templates/mail/exim4.minimal.erb
+++ b/templates/mail/exim4.minimal.erb
@@ -23,6 +23,9 @@
log_selector = +address_rewrite +all_parents +delivery_size +deliver_time
+incoming_interface +incoming_port +smtp_confirmation +smtp_protocol_error
+smtp_syntax_error
message_logs = false
+# Return Path
+return_path_remove = false
+
begin routers
# Catch unqualified e-mail addresses from MediaWiki
@@ -49,7 +52,8 @@
wiki_mail:
driver = manualroute
condition = ${if eqi{$header_X-Mailer:}{MediaWiki mailer}}
- errors_to = w...@wikimedia.org
+ errors_to = ${if def:h_return-path: {${address:$h_return-path:}} fail}
+ headers_remove = return-path
transport = remote_smtp
route_list = * <%= exim_mediawiki_route_list %>
@@ -74,10 +78,3 @@
* * F,2h,5m; F,1d,15m
-
-begin rewrite
-
-# Rewrite the envelope From for mails from internal servers in *.wmnet,
-# as they are usually rejected by sender domain address verification.
-
-*@$primary_hostname r...@wikimedia.org F
--
To view, visit https://gerrit.wikimedia.org/r/141287
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibb88a6cfd762f834340f6362fe70ea7e6c838b37
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
