RobH has submitted this change and it was merged.
Change subject: rm williams from site.pp,use iodine for otrs mail
......................................................................
rm williams from site.pp,use iodine for otrs mail
per RT #5908 williams is still up, but not doing anything,
and about to be wiped.
nevertheless, it appears in exim conf, in a route_list for
OTRS mail. williams used to be ticket.wikimedia.org (OTRS)
in the past, and that is now iodine instead.
so i'm removing it and just speculating that it should also use
iodine here. needs confirmation from OTRS person to make sure
and put into decom.pp to remove from monitoring
Change-Id: I0f0aa46039319bc66ff7904788997377a42be972
---
M manifests/decommissioning.pp
M manifests/site.pp
M templates/exim/exim4.conf.SMTP_IMAP_MM.erb
3 files changed, 2 insertions(+), 9 deletions(-)
Approvals:
RobH: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/decommissioning.pp b/manifests/decommissioning.pp
index ad26bd3..cb083fd 100644
--- a/manifests/decommissioning.pp
+++ b/manifests/decommissioning.pp
@@ -68,4 +68,5 @@
'virt3',
'virt4',
'wikinews-lb.wikimedia.org',
+'williams',
]
diff --git a/manifests/site.pp b/manifests/site.pp
index 7c4bb71..285f058 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2994,14 +2994,6 @@
include role::nova::compute
}
-node "williams.wikimedia.org" {
- include base,
- ganglia,
- ntp::client
-
- install_certificate{ "star.wikimedia.org": }
-}
-
node "iodine.wikimedia.org" {
include role::otrs
}
diff --git a/templates/exim/exim4.conf.SMTP_IMAP_MM.erb
b/templates/exim/exim4.conf.SMTP_IMAP_MM.erb
index 4516110..da88ba4 100644
--- a/templates/exim/exim4.conf.SMTP_IMAP_MM.erb
+++ b/templates/exim/exim4.conf.SMTP_IMAP_MM.erb
@@ -571,7 +571,7 @@
driver = manualroute
domains = +local_domains
condition = ${lookup mysql{SELECT value0 FROM system_address WHERE
value0='${quote_mysql:$local_part@$domain}'}{true}fail}
- route_list = * williams.wikimedia.org byname
+ route_list = * iodine.wikimedia.org byname
transport = remote_smtp
<% end %>
<% if enable_imap_delivery == "true" then -%>
--
To view, visit https://gerrit.wikimedia.org/r/88145
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0f0aa46039319bc66ff7904788997377a42be972
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <[email protected]>
Gerrit-Reviewer: Jgreen <[email protected]>
Gerrit-Reviewer: RobH <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
