some more squeeze + wheezy fixups

[dsa-puppet.git] / modules / monit / templates / monitrc.erb

diff --git a/modules/monit/templates/monitrc.erb b/modules/monit/templates/monitrc.erb
index e640cbe1fba3e319df45a2c061acfdc152847316..727e3aec965c7a99697c5ad5a2cfde373d7f9cd9 100644 (file)
--- a/modules/monit/templates/monitrc.erb
+++ b/modules/monit/templates/monitrc.erb
@@ -21,9 +21,8 @@
 ## Start monit in the background (run as a daemon) and check services at 
 ## 2-minute intervals.
 #
-<% if nodeinfo.has_key?('squeeze') and nodeinfo['squeeze'] %>
+<% if (nodeinfo.has_key?('squeeze') and nodeinfo['squeeze']) or (nodeinfo.has_key?('wheezy') and nodeinfo['wheezy']) %>
 set daemon 300
-<% else %>
 <% end %>
 #
 #