Faidon Liambotis has submitted this change and it was merged.
Change subject: phabricator: s/noreply/no-reply/
......................................................................
phabricator: s/noreply/no-reply/
<ocd>Use no-reply@ for originating mails from Phabricator</ocd>
Change-Id: Ib755e38dd1521e458badcc817359d1556e0b7a91
---
M manifests/role/phabricator.pp
M templates/exim/exim4.conf.SMTP_IMAP_MM.erb
2 files changed, 3 insertions(+), 3 deletions(-)
Approvals:
Rush: Looks good to me, but someone else must approve
Faidon Liambotis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/phabricator.pp b/manifests/role/phabricator.pp
index c2c1a30..bd0d680 100644
--- a/manifests/role/phabricator.pp
+++ b/manifests/role/phabricator.pp
@@ -25,7 +25,7 @@
'mysql.host' => 'm3-master.eqiad.wmnet',
'storage.default-namespace' => 'phlegal',
'phpmailer.smtp-host' => 'polonium.wikimedia.org',
- 'metamta.default-address' =>
'[email protected]',
+ 'metamta.default-address' =>
'[email protected]',
'metamta.domain' => 'legalpad.wikimedia.org',
},
}
@@ -63,7 +63,7 @@
'mysql.pass' => $::mysql_apppass,
'mysql.host' =>
'm3-master.eqiad.wmnet',
'phpmailer.smtp-host' =>
'polonium.wikimedia.org',
- 'metamta.default-address' => "noreply@${domain}",
+ 'metamta.default-address' => "no-reply@${domain}",
'metamta.domain' => "${domain}",
'metamta.maniphest.reply-handler-domain' => "${domain}",
'metamta.maniphest.public-create-email' => "task@${domain}",
diff --git a/templates/exim/exim4.conf.SMTP_IMAP_MM.erb
b/templates/exim/exim4.conf.SMTP_IMAP_MM.erb
index 86f0980..c7bd258 100644
--- a/templates/exim/exim4.conf.SMTP_IMAP_MM.erb
+++ b/templates/exim/exim4.conf.SMTP_IMAP_MM.erb
@@ -344,7 +344,7 @@
eat:
driver = redirect
domains = +phab_domains
- local_parts = noreply
+ local_parts = no-reply
data = :blackhole:
phabricator_bound:
--
To view, visit https://gerrit.wikimedia.org/r/169290
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib755e38dd1521e458badcc817359d1556e0b7a91
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis <[email protected]>
Gerrit-Reviewer: Faidon Liambotis <[email protected]>
Gerrit-Reviewer: Rush <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
