diff --git a/README.md b/README.md index 91fb8fe..7fb21cf 100644 --- a/README.md +++ b/README.md @@ -117,6 +117,9 @@ else default["monit"]["includes_dir"] = "/etc/monit/conf.d" end +# Custom include paths. +default["monit"]["includes"] = [] + # The monit::default recipe will load these monit_monitrc resources automatically # NOTE setting this attribute at the default level will append values to the array default["monit"]["default_monitrc_configs"] = %w[load ssh] diff --git a/attributes/default.rb b/attributes/default.rb index 46c821a..ca49390 100644 --- a/attributes/default.rb +++ b/attributes/default.rb @@ -71,6 +71,9 @@ default["monit"]["includes_dir"] = "/etc/monit/conf.d" end +# Custom include paths. +default["monit"]["includes"] = [] + # The monit::default recipe will load these monit_monitrc resources automatically # NOTE setting this attribute at the default level will append values to the array default["monit"]["default_monitrc_configs"] = %w[load ssh] diff --git a/templates/default/monitrc.erb b/templates/default/monitrc.erb index d028270..d63db12 100644 --- a/templates/default/monitrc.erb +++ b/templates/default/monitrc.erb @@ -72,4 +72,9 @@ set httpd port <%= node["monit"]["web_interface"]["port"] %> <% end %> # Include config files -include <%= node["monit"]["includes_dir"] %>/* +include "<%= node["monit"]["includes_dir"] %>/*" +<% if node["monit"]["includes"] && node["monit"]["includes"].size > 0 %> + <% node["monit"]["includes"].each do |path| %> +include "<%= path %>" + <% end %> +<% end %>