Faidon Liambotis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/141405
Change subject: mail: remove hardcoded mchenry/lists values
......................................................................
mail: remove hardcoded mchenry/lists values
Use $mail_smarthost in a few places instead of hardcoding mchenry/lists
(or mchenry alone).
Change-Id: Iff9842f238852effb633532e7a0e86162117c3dd
---
M manifests/role/analytics/hue.pp
M manifests/role/analytics/oozie.pp
M manifests/role/otrs.pp
M manifests/role/rt.pp
4 files changed, 7 insertions(+), 13 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/05/141405/1
diff --git a/manifests/role/analytics/hue.pp b/manifests/role/analytics/hue.pp
index 229013c..205a648 100644
--- a/manifests/role/analytics/hue.pp
+++ b/manifests/role/analytics/hue.pp
@@ -23,7 +23,7 @@
class { '::cdh4::hue':
secret_key => $secret_key,
- smtp_host => 'mchenry.wikimedia.org',
+ smtp_host => $::mail_smarthost[0]
smtp_from_email => "hue@$::fqdn",
ldap_url => inline_template('<%=
scope.lookupvar("ldap::role::config::labs::servernames").collect { |host|
"ldaps://#{host}" }.join(" ") %>'),
ldap_bind_dn =>
$ldap::role::config::labs::ldapconfig['proxyagent'],
diff --git a/manifests/role/analytics/oozie.pp
b/manifests/role/analytics/oozie.pp
index aa5edb0..e913600 100644
--- a/manifests/role/analytics/oozie.pp
+++ b/manifests/role/analytics/oozie.pp
@@ -38,8 +38,7 @@
class { 'cdh4::oozie::server':
jdbc_password => $jdbc_password,
- # TODO: infer smtp_host from some other puppet manifest.
- smtp_host => 'mchenry.wikimedia.org',
+ smtp_host => $::mail_smarthost[0]
smtp_from_email => "oozie@$::fqdn",
}
}
diff --git a/manifests/role/otrs.pp b/manifests/role/otrs.pp
index 9d83941..e0f921b 100644
--- a/manifests/role/otrs.pp
+++ b/manifests/role/otrs.pp
@@ -156,10 +156,7 @@
enable_otrs_server => true,
enable_spamassassin => true,
enable_external_mail => false,
- smart_route_list => [
- 'mchenry.wikimedia.org',
- 'lists.wikimedia.org',
- ],
+ smart_route_list => $::mail_smarthost,
}
Class['spamassassin'] -> Class['exim::roled']
diff --git a/manifests/role/rt.pp b/manifests/role/rt.pp
index 1683c07..373a983 100644
--- a/manifests/role/rt.pp
+++ b/manifests/role/rt.pp
@@ -18,21 +18,19 @@
local_domains => [ '+system_domains', '+rt_domains' ],
enable_mail_relay => false,
enable_external_mail => false,
- smart_route_list => [
- 'mchenry.wikimedia.org',
- 'lists.wikimedia.org',
- ],
+ smart_route_list => $::mail_smarthost,
enable_mailman => false,
rt_relay => true,
enable_mail_submission => false,
enable_spamassassin => false,
}
- # allow RT to receive mail from mchenry and sodium
+ # allow RT to receive mail from mail smarthosts
ferm::service { 'rt-smtp':
port => '25',
proto => 'tcp',
- srange => '(208.80.152.186/32 208.80.154.61/32)',
+ srange => inline_template('(<%= @mail_smarthost.map{|x|
"@resolve(#{x})" }.join(" ") %>)'),
+
}
ferm::service { 'rt-http':
--
To view, visit https://gerrit.wikimedia.org/r/141405
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iff9842f238852effb633532e7a0e86162117c3dd
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
