BBlack has submitted this change and it was merged.
Change subject: test uni.wm.o cert on cp1008
......................................................................
test uni.wm.o cert on cp1008
Change-Id: I121a0b295903643e36a5b79e7e2053096867b43b
---
M manifests/role/cache.pp
1 file changed, 7 insertions(+), 4 deletions(-)
Approvals:
BBlack: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index d65f242..f177c00 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -532,9 +532,9 @@
# For unified or star certs we need to do a bit of
# mapping; in other cases we should be OK with the raw name
$check_cert = $certname ? {
- 'unified.wikimedia.org' => '*.wikipedia.org',
- /^star\.(.+)$/ => "*.$1",
- default => $certname
+ 'unified.wikimedia.org' => '*.wikipedia.org',
+ 'uni.wikimedia.org' => '*.wikipedia.org',
+ default => $certname
}
# Nagios monitoring
@@ -564,7 +564,10 @@
include role::protoproxy::ssl::common
localssl { 'unified':
- certname => 'unified.wikimedia.org',
+ certname => $::hostname ? {
+ 'cp1008' => 'uni.wikimedia.org',
+ default => 'unified.wikimedia.org',
+ },
default_server => true,
}
--
To view, visit https://gerrit.wikimedia.org/r/179183
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I121a0b295903643e36a5b79e7e2053096867b43b
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack <[email protected]>
Gerrit-Reviewer: BBlack <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
