X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Fmonit%2Fmanifests%2Finit.pp;h=2e0e68aa215e314b9177fde9cbd6e4449a4b4f9d;hb=48214e45a68cd664374a265d274163fc36382bb1;hp=b7e909d1cebd3b8f7345a36c9722182eb815ed5b;hpb=f256a66ce3a6f63e4bac8a602391d0dc77de2e6d;p=dsa-puppet.git

diff --git a/modules/monit/manifests/init.pp b/modules/monit/manifests/init.pp
index b7e909d1..2e0e68aa 100644
--- a/modules/monit/manifests/init.pp
+++ b/modules/monit/manifests/init.pp
@@ -1,53 +1,63 @@
+# = Class: monit
+#
+# This class installs and configures monit
+#
+# == Sample Usage:
+#
+#   include monit
+#
 class monit {
-    package { "monit": ensure => installed }
 
-    file {
-        "/etc/monit/":
-          ensure  => directory,
-          owner   => root,
-          group   => root,
-          mode    => 755,
-          purge   => true
-          ;
+	package { 'monit':
+		ensure => installed
+	}
 
-        "/etc/monit/monitrc":
-          content => template("monit/monitrc.erb"),
-          require => Package["monit"],
-          notify  => Exec["monit restart"],
-          mode    => 400
-          ;
+	$cmd = $::lsbdistcodename ? {
+		'squeeze'    => '/usr/sbin/monit',
+		default  => '/usr/bin/monit',
+	}
 
-        "/etc/monit/monit.d":
-          ensure  => directory,
-          owner   => root,
-          group   => root,
-          mode    => 750,
-          purge   => true
-          ;
+	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\"",
+		],
+		notify => Exec['init q'],
+	}
 
-        "/etc/monit/monit.d/01puppet":
-          source  => "puppet:///monit/puppet",
-          require => Package["monit"],
-          notify  => Exec["monit restart"],
-          mode    => 440
-          ;
+	file { '/etc/monit/':
+		ensure  => directory,
+		mode    => '0755',
+		purge   => true,
+		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'
+	}
+	file { '/etc/monit/monit.d/01puppet':
+		source  => 'puppet:///modules/monit/puppet',
+		mode    => '0440'
+	}
+	file { '/etc/monit/monit.d/00debian.org':
+		source  => 'puppet:///modules/monit/debianorg',
+		mode    => '0440'
+	}
+	file { '/etc/default/monit':
+		content => template('monit/default.erb'),
+		require => Package['monit'],
+		notify  => Exec['service monit stop']
+	}
 
-        "/etc/monit/monit.d/00debian.org":
-          source  => "puppet:///monit/debianorg",
-          require => Package["monit"],
-          notify  => Exec["monit restart"],
-          mode    => 440
-          ;
-
-        "/etc/default/monit":
-          content => template("monit/default.erb"),
-          require => Package["monit"],
-          notify  => Exec["monit restart"]
-          ;
-    }
-    exec { "monit restart":
-        path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
-        refreshonly => true,
-    }
+	exec { 'service monit stop':
+		refreshonly => true,
+	}
 }
-