From: Peter Palfrader <peter@palfrader.org>
Date: Mon, 21 Jun 2010 16:56:41 +0000 (+0200)
Subject: disabling monit by moving S99 to K99monit with samhain really sucks since Debian... 
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=c20773059b2aadcfbe11e4ebb03d6fe66b0662ae;p=mirror%2Fdsa-puppet.git

disabling monit by moving S99 to K99monit with samhain really sucks since Debian reorders them every time, so puppet puts it back and samhain complains.  Disable monit startup via etc/default/monit
---

diff --git a/modules/monit/manifests/init.pp b/modules/monit/manifests/init.pp
index 1fcbf898f..06f71a0ad 100644
--- a/modules/monit/manifests/init.pp
+++ b/modules/monit/manifests/init.pp
@@ -13,11 +13,10 @@ class monit {
 
 
     file {
-        "/etc/rc2.d/K99monit":
-          ensure  => "../init.d/monit";
-
-        "/etc/rc2.d/S99monit":
-          ensure  => absent;
+        #"/etc/rc2.d/K99monit":
+        #  ensure  => "../init.d/monit";
+        #"/etc/rc2.d/S99monit":
+        #  ensure  => absent;
 
         "/etc/monit/":
           ensure  => directory,
diff --git a/modules/monit/templates/default.erb b/modules/monit/templates/default.erb
index 95ec992e9..10ce8b813 100644
--- a/modules/monit/templates/default.erb
+++ b/modules/monit/templates/default.erb
@@ -9,7 +9,7 @@
 # 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 %>