Dzahn has submitted this change and it was merged.
Change subject: icinga: move ssl cert install to role
......................................................................
icinga: move ssl cert install to role
pre-requisite for If260112567215bb9. Then we can
have the SSL settings, cert and monitoring in one place,
in the role, as it should be
Change-Id: Id3b526b16ff73156f76ed9849d9e54c0fa2efac8
---
M manifests/role/icinga.pp
M modules/icinga/manifests/web.pp
2 files changed, 1 insertion(+), 2 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/manifests/role/icinga.pp b/manifests/role/icinga.pp
index b7de3f5..3f69b5e 100644
--- a/manifests/role/icinga.pp
+++ b/manifests/role/icinga.pp
@@ -32,6 +32,7 @@
}
$ssl_settings = ssl_ciphersuite('apache-2.2', 'compat', '365')
+ sslcert::certificate { 'icinga.wikimedia.org': }
class { '::icinga': }
class { '::icinga::web': }
diff --git a/modules/icinga/manifests/web.pp b/modules/icinga/manifests/web.pp
index 4556497..102cddf 100644
--- a/modules/icinga/manifests/web.pp
+++ b/modules/icinga/manifests/web.pp
@@ -48,6 +48,4 @@
ensure => absent,
}
- sslcert::certificate { 'icinga.wikimedia.org': }
-
}
--
To view, visit https://gerrit.wikimedia.org/r/247570
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id3b526b16ff73156f76ed9849d9e54c0fa2efac8
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: Filippo Giunchedi <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
