coren has uploaded a new change for review. https://gerrit.wikimedia.org/r/165249
Change subject: Labs: Allow using a full MX configurably ...................................................................... Labs: Allow using a full MX configurably Setting the mail_full_mx puppet variable to any non-empty string causes role::mail::sender to include role::mail::mx instead, a functional superset. Change-Id: I5b9843d548d99acc214c58cd2f7b784fa622c004 --- M manifests/role/mail.pp 1 file changed, 7 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/49/165249/1 diff --git a/manifests/role/mail.pp b/manifests/role/mail.pp index d24af3f..ec8b640 100644 --- a/manifests/role/mail.pp +++ b/manifests/role/mail.pp @@ -1,7 +1,11 @@ class role::mail::sender { - class { 'exim4': - queuerunner => 'queueonly', - config => template('mail/exim4.minimal.erb'), + if $::mail_full_mx { + class { 'exim4': + queuerunner => 'queueonly', + config => template('mail/exim4.minimal.erb'), + } + } else { + class { 'role::mail::mx': } } } -- To view, visit https://gerrit.wikimedia.org/r/165249 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5b9843d548d99acc214c58cd2f7b784fa622c004 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: coren <mpellet...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits