diff --git a/.puppet/modules/icinga2/manifests/init.pp b/.puppet/modules/icinga2/manifests/init.pp index 26c7300a5..e5b77ad75 100644 --- a/.puppet/modules/icinga2/manifests/init.pp +++ b/.puppet/modules/icinga2/manifests/init.pp @@ -15,7 +15,7 @@ class icinga2 { include icinga_packages package { [ - 'icinga2', 'icinga2-doc', 'icinga2-debuginfo' + 'icinga2', 'icinga2-doc' ]: ensure => latest, require => Class['icinga_packages'], @@ -35,12 +35,8 @@ class icinga2 { links => follow, owner => 'icinga', group => 'icinga', - mode => 6750, + mode => '6750', } icinga2::feature { [ 'statusdata', 'command', 'compatlog' ]: } - - icinga2::feature { 'api': - ensure => absent, - } } diff --git a/.puppet/profiles/icinga2_dev/manifests/init.pp b/.puppet/profiles/icinga2_dev/manifests/init.pp index 7082fe935..322480594 100644 --- a/.puppet/profiles/icinga2_dev/manifests/init.pp +++ b/.puppet/profiles/icinga2_dev/manifests/init.pp @@ -19,11 +19,15 @@ class icinga2_dev { include monitoring_test_config icinga2::config { [ - 'conf.d/test-config', 'conf.d/commands', 'constants', + 'conf.d/test-config', 'conf.d/commands', 'constants' ]: source => 'puppet:///modules/icinga2_dev', } + icinga2::feature { 'api': + ensure => absent, + } + icinga2::feature { 'ido-pgsql': ensure => absent, require => Class['icinga2_pgsql'],