some more squeeze + wheezy fixups

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

diff --git a/modules/monit/templates/default.erb b/modules/monit/templates/default.erb
index 95ec992e928f38d40b8ad20e44f1d9ae62dc5b49..15a0ba07c41b9623ec4ba591aee53c6d5eae5ab8 100644 (file)
--- a/modules/monit/templates/default.erb
+++ b/modules/monit/templates/default.erb
@@ -9,10 +9,9 @@
 # Fredrik Steen <stone@debian.org>
 
 # You must set this variable to for monit to start
-startup=1
+startup=0
 
-<% if nodeinfo.has_key?('squeeze') and not nodeinfo['squeeze'].empty? %>
-<% else %>
+<% unless (nodeinfo.has_key?('squeeze') and nodeinfo['squeeze']) or (nodeinfo.has_key?('wheezy') and nodeinfo['wheezy']) %>
 
 # To change the intervals which monit should run uncomment
 # and change this variable.