X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fmonit%2Fmanifests%2Finit.pp;fp=modules%2Fmonit%2Fmanifests%2Finit.pp;h=1543407a3f7f9c5326d9a6165fd434508f732277;hb=f2c3ac3b6d62f9e0d049e370aa031daea503b7c7;hp=999cdfb3d8a8a998fcb6722060006a385e6b7d6c;hpb=201ff17c228c62697e6fe6860d37d00a61072168;p=mirror%2Fdsa-puppet.git

diff --git a/modules/monit/manifests/init.pp b/modules/monit/manifests/init.pp
index 999cdfb3d..1543407a3 100644
--- a/modules/monit/manifests/init.pp
+++ b/modules/monit/manifests/init.pp
@@ -7,65 +7,15 @@
 #   include monit
 #
 class monit {
-	if versioncmp($::lsbmajdistrelease, '7') <= 0 {
-		package { 'monit':
-			ensure => installed
-		}
-
-		augeas { 'inittab_monit':
-			context => '/files/etc/inittab',
-			changes => [
-				'set mo/runlevels 2345',
-				'set mo/action respawn',
-				"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,
-			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 { '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
-		}
+	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
 	}
 }