X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fmonit%2Fmanifests%2Finit.pp;h=999cdfb3d8a8a998fcb6722060006a385e6b7d6c;hb=1b40c402500f4a7df439bf2c6b0bab5084f5e676;hp=410ed821c0d7175338a5375e4c25850e3f5560a9;hpb=046908f3cf81a71133734f78ff0aff466a2b031b;p=mirror%2Fdsa-puppet.git

diff --git a/modules/monit/manifests/init.pp b/modules/monit/manifests/init.pp
index 410ed821c..999cdfb3d 100644
--- a/modules/monit/manifests/init.pp
+++ b/modules/monit/manifests/init.pp
@@ -7,22 +7,17 @@
 #   include monit
 #
 class monit {
-	if $::lsbmajdistrelease <= 7 {
+	if versioncmp($::lsbmajdistrelease, '7') <= 0 {
 		package { 'monit':
 			ensure => installed
 		}
 
-		$cmd = $::lsbdistcodename ? {
-			'squeeze'    => '/usr/sbin/monit',
-			default  => '/usr/bin/monit',
-		}
-
 		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\"",
+				"set mo/process \"/usr/bin/monit -d 300 -I -c /etc/monit/monitrc -s /var/lib/monit/monit.state\"",
 			],
 			notify => Exec['init q'],
 		}