X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fmonit%2Ftemplates%2Fdefault.erb;h=15a0ba07c41b9623ec4ba591aee53c6d5eae5ab8;hb=47e85ae8925d80c78310477e3536cbff6401fd86;hp=95ec992e928f38d40b8ad20e44f1d9ae62dc5b49;hpb=c6a9130c6a10079b5e1a2522c8faea0e83bf21fe;p=mirror%2Fdsa-puppet.git

diff --git a/modules/monit/templates/default.erb b/modules/monit/templates/default.erb
index 95ec992e9..15a0ba07c 100644
--- 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.