01tonythomas has uploaded a new change for review.
https://gerrit.wikimedia.org/r/168175
Change subject: Added the beta hostname to local_domains to make exim use
mw_verp_api
......................................................................
Added the beta hostname to local_domains to make exim use mw_verp_api
The bounce needs to get HTTP POSTed to the webserver ( currently running
on mediawiki-verp in labs ) which will not happen until mediaiwki-verp.
wmflabs.org is there in the local_domains list. This patch adds the hostname
to the local_domains, and make sure only labs is affected
Change-Id: I0600d323c80743ce01d284740efd4fc6217739e5
---
M manifests/role/mail.pp
M templates/exim/exim4.conf.SMTP_IMAP_MM.erb
2 files changed, 13 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/75/168175/1
diff --git a/manifests/role/mail.pp b/manifests/role/mail.pp
index 08f87aa..65e1d0d 100644
--- a/manifests/role/mail.pp
+++ b/manifests/role/mail.pp
@@ -32,6 +32,12 @@
]
$verp_post_connect_server = 'mediawiki-verp.wmflabs.org'
$verp_bounce_post_url =
'http://mediawiki-verp.wmflabs.org/w/api.php'
+ $local_domains = [
+ '+system_domains',
+ '+wikimedia_domains',
+ '+legacy_mailman_domains',
+ 'mediawiki-verp.wmflabs.org'
+ ]
}
'production': {
# currently not used as bouncehandler extension is not yet
installed in production
@@ -39,6 +45,11 @@
$verp_domains = [ ]
$verp_post_connect_server = 'login.wikimedia.org'
$verp_bounce_post_url =
"appservers.svc.${::mw_primary}.wmnet/w/api.php"
+ $local_domains = [
+ '+system_domains',
+ '+wikimedia_domains',
+ '+legacy_mailman_domains'
+ ]
}
default: {
fail('unknown realm, should be labs or production')
@@ -46,11 +57,7 @@
}
class { 'exim::roled':
- local_domains => [
- '+system_domains',
- '+wikimedia_domains',
- '+legacy_mailman_domains',
- ],
+ local_domains => $local_domains,
enable_mail_relay => 'primary',
enable_external_mail => true,
mediawiki_relay => true,
diff --git a/templates/exim/exim4.conf.SMTP_IMAP_MM.erb
b/templates/exim/exim4.conf.SMTP_IMAP_MM.erb
index a9bce3a..1fd9bb9 100644
--- a/templates/exim/exim4.conf.SMTP_IMAP_MM.erb
+++ b/templates/exim/exim4.conf.SMTP_IMAP_MM.erb
@@ -43,7 +43,7 @@
<% end -%>
domainlist system_domains = @
-domainlist local_domains = <%= local_domains.join(" : ") %>
+domainlist local_domains = <%= @local_domains.join(" : ") %>
domainlist wikimedia_domains = lsearch;CONFDIR/wikimedia_domains
domainlist verp_domains = <%= @verp_domains.join(" : ") %>
<% if enable_mail_relay != false %>
--
To view, visit https://gerrit.wikimedia.org/r/168175
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0600d323c80743ce01d284740efd4fc6217739e5
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: 01tonythomas <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
