From 26343663791ce05a583a3c56f5f29a6497720f5b Mon Sep 17 00:00:00 2001 From: Lennart Betz Date: Fri, 21 Apr 2017 10:16:51 +0200 Subject: [PATCH] fix #285 disable feature checker does not trigger refresh --- manifests/config.pp | 15 +++++++++++---- manifests/install.pp | 6 ------ 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/manifests/config.pp b/manifests/config.pp index ed69a9301..564fc8f2d 100644 --- a/manifests/config.pp +++ b/manifests/config.pp @@ -17,10 +17,11 @@ fail("icinga2::config is a private class of the module icinga2, you're not permitted to use it.") } - $constants = prefix($::icinga2::_constants, 'const ') - $conf_dir = $::icinga2::params::conf_dir - $plugins = $::icinga2::plugins - $confd = $::icinga2::_confd + $constants = prefix($::icinga2::_constants, 'const ') + $conf_dir = $::icinga2::params::conf_dir + $plugins = $::icinga2::plugins + $confd = $::icinga2::_confd + $purge_features = $::icinga2::purge_features if $::kernel != 'windows' { $template_constants = icinga2_attributes($constants) @@ -40,4 +41,10 @@ content => $template_mainconfig, } + file { "${conf_dir}/features-enabled": + ensure => directory, + purge => $purge_features, + recurse => $purge_features, + } + } diff --git a/manifests/install.pp b/manifests/install.pp index 07d5534f8..8400e22ed 100644 --- a/manifests/install.pp +++ b/manifests/install.pp @@ -35,12 +35,6 @@ } } - file { "${conf_dir}/features-enabled": - ensure => directory, - purge => $purge_features, - recurse => $purge_features, - } - # anchor, i.e. for config directory set by confd parameter file { $conf_dir: ensure => directory,