X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fmonit%2Fmanifests%2Finit.pp;h=977f1847cf29a34483cc3eedbf1d5f82c9c7c3e0;hb=6f2e5fc86e49c12b12eef39fc69e0e810a32c318;hp=8b9880ff4cfd82b939db4a204db71d1ef885c07a;hpb=61b1f29e849df28f2892efc5f98318611e99eeeb;p=mirror%2Fdsa-puppet.git

diff --git a/modules/monit/manifests/init.pp b/modules/monit/manifests/init.pp
index 8b9880ff4..977f1847c 100644
--- a/modules/monit/manifests/init.pp
+++ b/modules/monit/manifests/init.pp
@@ -7,62 +7,65 @@
 #   include monit
 #
 class monit {
+	if $::lsbmajdistrelease <= '7' {
+		package { 'monit':
+			ensure => installed
+		}
 
-	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',
+		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'],
-	}
+				"set mo/process \"/usr/bin/monit -d 300 -I -c /etc/monit/monitrc -s /var/lib/monit/monit.state\"",
+			],
+			notify => Exec['init q'],
+		}
 
-	file { '/etc/monit/':
-		ensure  => directory,
-		owner   => root,
-		group   => root,
-		mode    => '0755',
-		purge   => true,
-		notify  => Exec['monit stop'],
-		require => Package['monit'],
-	}
-	file { '/etc/monit/monit.d':
-		ensure  => directory,
-		owner   => root,
-		group   => root,
-		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']
-	}
+		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']
+		}
 
-	exec { 'monit stop':
-		path        => '/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin',
-		refreshonly => true,
+		exec { 'service monit stop':
+			refreshonly => true,
+		}
+	} else {
+		package { 'monit':
+			ensure => purged
+		}
+		file { [ '/etc/monit/',
+		         '/etc/monit/monit.d',
+		         '/etc/monit/monit.d/01puppet',
+		         '/etc/monit/monit.d/00debian.org'
+			]:
+			ensure  => absent,
+			force   => true
+		}
 	}
 }