X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fmonit%2Fmanifests%2Finit.pp;h=1543407a3f7f9c5326d9a6165fd434508f732277;hb=267a7cce45366203fdb3848782812cf5ba44b709;hp=e18c0fe0043aa22f5461f0ad00dfa3ecbc17fafa;hpb=96d02de0e841b2a067dba244d62562cd46d4035b;p=mirror%2Fdsa-puppet.git

diff --git a/modules/monit/manifests/init.pp b/modules/monit/manifests/init.pp
index e18c0fe00..1543407a3 100644
--- a/modules/monit/manifests/init.pp
+++ b/modules/monit/manifests/init.pp
@@ -7,58 +7,15 @@
 #   include monit
 #
 class monit {
-
 	package { 'monit':
-		ensure => installed
-	}
-
-	$cmd = $::lsbdistcodename ? {
-		'sid'    => '/usr/bin/monit',
-		'wheezy' => '/usr/bin/monit',
-		default  => '/usr/sbin/monit',
-	}
-
-	augeas { 'inittab':
-		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'],
-	}
-
-	file { '/etc/monit/':
-		ensure  => directory,
-		mode    => '0755',
-		purge   => true,
-		notify  => Exec['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['monit stop']
-	}
-
-	exec { 'monit stop':
-		path        => '/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin',
-		refreshonly => true,
+		ensure => purged
+	}
+	file { [ '/etc/monit/',
+		 '/etc/monit/monit.d',
+		 '/etc/monit/monit.d/01puppet',
+		 '/etc/monit/monit.d/00debian.org'
+		]:
+		ensure  => absent,
+		force   => true
 	}
 }