X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fmonit%2Fmanifests%2Finit.pp;h=2e0e68aa215e314b9177fde9cbd6e4449a4b4f9d;hb=73bc21ad97310e97f5be2e0725f87ef2317e6048;hp=4c9b736bd49706076879956b4caf80a61253ca69;hpb=3eb533e5499e66423bafdedaf6c7d08ead1772de;p=mirror%2Fdsa-puppet.git

diff --git a/modules/monit/manifests/init.pp b/modules/monit/manifests/init.pp
index 4c9b736bd..2e0e68aa2 100644
--- a/modules/monit/manifests/init.pp
+++ b/modules/monit/manifests/init.pp
@@ -1,3 +1,11 @@
+# = Class: monit
+#
+# This class installs and configures monit
+#
+# == Sample Usage:
+#
+#   include monit
+#
 class monit {
 
 	package { 'monit':
@@ -5,29 +13,32 @@ class monit {
 	}
 
 	$cmd = $::lsbdistcodename ? {
-		'sid'    => '/usr/bin/monit',
-		'wheezy' => '/usr/bin/monit',
-		default  => '/usr/sbin/monit',
+		'squeeze'    => '/usr/sbin/monit',
+		default  => '/usr/bin/monit',
 	}
 
-	augeas { 'inittab':
+	augeas { 'inittab_monit':
 		context => '/files/etc/inittab',
-		changes => [ 'set mo/runlevels 2345',
-				'set mo/action respawn',
-				"set mo/process \"$cmd -d 300 -I -c /etc/monit/monitrc -s /var/lib/monit/monit.state\"",
+		changes => [
+			'set mo/runlevels 2345',
+			'set mo/action respawn',
+			"set mo/process \"$cmd -d 300 -I -c /etc/monit/monitrc -s /var/lib/monit/monit.state\"",
 		],
 		notify => Exec['init q'],
 	}
 
-	file { [ '/etc/monit/', '/etc/monit/monit.d']:
+	file { '/etc/monit/':
 		ensure  => directory,
-		owner   => root,
-		group   => root,
 		mode    => '0755',
 		purge   => true,
-		notify  => Exec['monit stop'],
+		notify  => Exec['service monit stop'],
 		require => Package['monit'],
 	}
+	file { '/etc/monit/monit.d':
+		ensure  => directory,
+		mode    => '0750',
+		purge   => true,
+	}
 	file { '/etc/monit/monitrc':
 		content => template('monit/monitrc.erb'),
 		mode    => '0400'
@@ -43,11 +54,10 @@ class monit {
 	file { '/etc/default/monit':
 		content => template('monit/default.erb'),
 		require => Package['monit'],
-		notify  => Exec['monit stop']
+		notify  => Exec['service monit stop']
 	}
 
-	exec { 'monit stop':
-		path        => '/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin',
+	exec { 'service monit stop':
 		refreshonly => true,
 	}
 }