fix voxpupuli#285 disable feature checker does not trigger refresh

n00by · Apr 26, 2018 · 2634366 · 2634366
1 parent 59a10f9
commit 2634366
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 10 deletions.
diff --git 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
@@ -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,