Add the ability to include multiple user defined directories.

Icinga · Nov 4, 2015 · 086e751 · 086e751
1 parent a438e86
commit 086e751
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/attributes/default.rb b/attributes/default.rb
@@ -32,7 +32,7 @@
 default['icinga2']['objects_dir'] = ::File.join(node['icinga2']['conf_dir'], node['icinga2']['objects_d'])
 
 # user defined icing2 object / configuration
-default['icinga2']['user_defined_objects_d'] = 'user_defined_objects'
+default['icinga2']['user_defined_objects_d'] = 'user_defined_objects'    # use an array for multiple directories
 default['icinga2']['user_defined_objects_dir'] = ::File.join(node['icinga2']['conf_dir'], node['icinga2']['user_defined_objects_d'])
 
 default['icinga2']['features_enabled_dir'] = ::File.join(node['icinga2']['conf_dir'], 'features-enabled')

diff --git a/templates/default/icinga2.conf.erb b/templates/default/icinga2.conf.erb
@@ -70,5 +70,11 @@ include_recursive "<%= node['icinga2']['objects_d'] -%>"
 
 <% if node['icinga2']['user_defined_objects_d'] -%>
 // User defined Objects / Configuration
+<% if node['icinga2']['user_defined_objects_d'].is_a? Array
+  node['icinga2']['user_defined_objects_d'].each do |include_dir| -%>
+include_recursive "<%= include_dir -%>"
+<% end # each -%>
+<% else # if not array -%>
 include_recursive "<%= node['icinga2']['user_defined_objects_d'] -%>"
-<% end -%>
+<% end # if array -%>
+<% end # if objects_d defined -%>