From: Julien Cristau <jcristau@debian.org>
Date: Sun, 29 Jan 2017 17:45:45 +0000 (+0100)
Subject: Only set ExecStart command for bacula-fd on stretch
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=993902afaabd8e7eb7823ecb4ae5ae730104f64f;p=mirror%2Fdsa-puppet.git

Only set ExecStart command for bacula-fd on stretch

On jessie let the init script + /etc/default file handle things.
---

diff --git a/modules/bacula/manifests/client.pp b/modules/bacula/manifests/client.pp
index 81db8712c..66c432671 100644
--- a/modules/bacula/manifests/client.pp
+++ b/modules/bacula/manifests/client.pp
@@ -50,18 +50,24 @@ class bacula::client inherits bacula {
 		require => Package['bacula-fd'],
 		notify  => Service['bacula-fd'],
 	}
-	file { '/etc/systemd/system/bacula-fd.service.d':
-		ensure	=> directory,
-		mode	=> '0755',
-		owner	=> root,
-		group	=> root,
-	}
-	file { '/etc/systemd/system/bacula-fd.service.d/user.conf':
-		source	=> 'puppet:///modules/bacula/bacula-fd-systemd',
-		mode	=> '0400',
-		owner	=> root,
-		group	=> root,
-		notify	=> Exec['systemctl daemon-reload'],
+	if $::lsbmajdistrelease >= 9 {
+		file { '/etc/systemd/system/bacula-fd.service.d':
+			ensure	=> directory,
+			mode	=> '0755',
+			owner	=> root,
+			group	=> root,
+		}
+		file { '/etc/systemd/system/bacula-fd.service.d/user.conf':
+			source	=> 'puppet:///modules/bacula/bacula-fd-systemd',
+			mode	=> '0400',
+			owner	=> root,
+			group	=> root,
+			notify	=> Exec['systemctl daemon-reload'],
+		}
+	} else {
+		file { '/etc/systemd/system/bacula-fd.service.d/user.conf':
+			ensure	=> absent,
+		}
 	}
 
 	@ferm::rule { 'dsa-bacula-fd-v4':