From: Julien Cristau <jcristau@debian.org>
Date: Wed, 2 Mar 2016 22:26:57 +0000 (+0100)
Subject: monit: squeeze cleanup
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=ec4fd3195fd71edde7bd1e7a9624b4b4255f8da5;p=mirror%2Fdsa-puppet.git

monit: squeeze cleanup

Signed-off-by: Julien Cristau <jcristau@debian.org>
---

diff --git a/modules/monit/manifests/init.pp b/modules/monit/manifests/init.pp
index 410ed821c..88055a109 100644
--- a/modules/monit/manifests/init.pp
+++ b/modules/monit/manifests/init.pp
@@ -12,17 +12,12 @@ class 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'],
 		}