BBlack has uploaded a new change for review.
https://gerrit.wikimedia.org/r/175452
Change subject: r::c::localssl: monitor based on $certname
......................................................................
r::c::localssl: monitor based on $certname
Change-Id: Ib9c498e2cf26c0c876a8ed580ae5dc6678211b36
---
M manifests/role/cache.pp
1 file changed, 1 insertion(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/52/175452/1
diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index 734b101..fc7a0c2 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -529,18 +529,10 @@
define localssl($certname, $server_name=$::fqdn, $server_aliases=[],
$default_server=false) {
# Assumes that LVS service IPs are setup elsewhere
- # 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
- }
-
# Nagios monitoring
monitoring::service { "https_${name}":
description => "HTTPS_${name}",
- check_command => "check_ssl_cert!${check_cert}",
+ check_command => "check_ssl_cert!${certname}",
}
install_certificate { $certname:
--
To view, visit https://gerrit.wikimedia.org/r/175452
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib9c498e2cf26c0c876a8ed580ae5dc6678211b36
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
