summaryrefslogtreecommitdiff
path: root/sitemodules
diff options
context:
space:
mode:
authorJan Dittberner <jandd@cacert.org>2019-07-21 14:56:26 +0200
committerJan Dittberner <jandd@cacert.org>2019-07-21 14:56:26 +0200
commite3b2e2aa3f04440f45ac00d676a1cb393ec5dc4e (patch)
tree402ae715bac140cea37cc96a5e565b330e061e05 /sitemodules
parentad8764fe234a82cad8031bf6507d5033b99dc065 (diff)
downloadcacert-puppet-e3b2e2aa3f04440f45ac00d676a1cb393ec5dc4e.tar.gz
cacert-puppet-e3b2e2aa3f04440f45ac00d676a1cb393ec5dc4e.tar.xz
cacert-puppet-e3b2e2aa3f04440f45ac00d676a1cb393ec5dc4e.zip
Use icinga2 class in icinga2_master manifest
Diffstat (limited to 'sitemodules')
-rw-r--r--sitemodules/profiles/manifests/icinga2_common.pp4
-rw-r--r--sitemodules/profiles/manifests/icinga2_master.pp7
2 files changed, 7 insertions, 4 deletions
diff --git a/sitemodules/profiles/manifests/icinga2_common.pp b/sitemodules/profiles/manifests/icinga2_common.pp
index 7e81af2..8260117 100644
--- a/sitemodules/profiles/manifests/icinga2_common.pp
+++ b/sitemodules/profiles/manifests/icinga2_common.pp
@@ -32,10 +32,6 @@ class profiles::icinga2_common (
String $master_host,
String $master_certificate,
) {
- class { '::icinga2':
- manage_repo => false,
- features => ['mainlog']
- }
if $::lsbdistcodename == 'stretch' {
apt::pin { 'icinga2_backports':
packages => [
diff --git a/sitemodules/profiles/manifests/icinga2_master.pp b/sitemodules/profiles/manifests/icinga2_master.pp
index ce196e0..7659d96 100644
--- a/sitemodules/profiles/manifests/icinga2_master.pp
+++ b/sitemodules/profiles/manifests/icinga2_master.pp
@@ -41,6 +41,13 @@ class profiles::icinga2_master (
String $master_csr,
) {
include 'profiles::icinga2_common'
+ class { '::icinga2':
+ manage_repo => false,
+ features => ['mainlog', 'checker'],
+ constants => {
+ 'ZoneName' => $::fqdn,
+ },
+ }
postgresql::server::db { 'icinga2':
user => 'icinga2',