Faidon Liambotis has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/169291

Change subject: phabricator: don't hardcode mail smarthost
......................................................................

phabricator: don't hardcode mail smarthost

Do not hardcode polonium, use $mail_smarthost instead. Moreover,
PHPMailer apparently supports multiple smarthosts, to be tried in order,
so add all of them instead of just one.

Change-Id: I4bf8011210b408a5af846e728d4dbd3d5e185e1e
---
M manifests/role/phabricator.pp
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/91/169291/1

diff --git a/manifests/role/phabricator.pp b/manifests/role/phabricator.pp
index bd0d680..13217fd 100644
--- a/manifests/role/phabricator.pp
+++ b/manifests/role/phabricator.pp
@@ -24,7 +24,7 @@
             'mysql.pass'                         => $::mysql_apppass,
             'mysql.host'                         => 'm3-master.eqiad.wmnet',
             'storage.default-namespace'          => 'phlegal',
-            'phpmailer.smtp-host'                => 'polonium.wikimedia.org',
+            'phpmailer.smtp-host'                => inline_template('<%= 
@mail_smarthost.join(";") %>'),
             'metamta.default-address'            => 
'[email protected]',
             'metamta.domain'                     => 'legalpad.wikimedia.org',
         },
@@ -62,7 +62,7 @@
             'mysql.user'                             => $::mysql_appuser,
             'mysql.pass'                             => $::mysql_apppass,
             'mysql.host'                             => 
'm3-master.eqiad.wmnet',
-            'phpmailer.smtp-host'                    => 
'polonium.wikimedia.org',
+            'phpmailer.smtp-host'                    => inline_template('<%= 
@mail_smarthost.join(";") %>'),
             'metamta.default-address'                => "no-reply@${domain}",
             'metamta.domain'                         => "${domain}",
             'metamta.maniphest.reply-handler-domain' => "${domain}",

-- 
To view, visit https://gerrit.wikimedia.org/r/169291
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4bf8011210b408a5af846e728d4dbd3d5e185e1e
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to