Faidon Liambotis has submitted this change and it was merged. Change subject: cache: use check_sslxNN instead of NN x check_ssl ......................................................................
cache: use check_sslxNN instead of NN x check_ssl Change-Id: I85d1047d0faed954abf65b56fcbe682a698493d1 --- M manifests/role/cache.pp 1 file changed, 5 insertions(+), 9 deletions(-) Approvals: Faidon Liambotis: Looks good to me, approved jenkins-bot: Verified diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp index 7fb68cc..e42443a 100644 --- a/manifests/role/cache.pp +++ b/manifests/role/cache.pp @@ -567,14 +567,6 @@ define localssl($certname, $server_name=$::fqdn, $server_aliases=[], $default_server=false) { # Assumes that LVS service IPs are setup elsewhere - # Nagios monitoring - # FIXME: figure out a way to monitor the unified certificate - # (unified.wikimedia.org / uni.wikimedia.org) without SNI - monitoring::service { "https_${name}": - description => "HTTPS_${name}", - check_command => "check_ssl_http!${certname}", - } - install_certificate { $certname: before => Protoproxy::Localssl[$name], } @@ -588,7 +580,6 @@ } } - # ssl::sni To replace ssl::unified above after testing... class ssl::sni { #TODO: kill the old wmf_ca include certificates::wmf_ca @@ -635,6 +626,11 @@ 'm.mediawiki.org':; 'mediawiki.org':; } + + monitoring::service { 'https': + description => 'HTTPS', + check_command => 'check_sslxNN', + } } # As above, but for misc instead of generic prod -- To view, visit https://gerrit.wikimedia.org/r/182326 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I85d1047d0faed954abf65b56fcbe682a698493d1 Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Faidon Liambotis <fai...@wikimedia.org> Gerrit-Reviewer: Faidon Liambotis <fai...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits