X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbacula%2Fmanifests%2Fclient.pp;h=230b29f5ae1246efc5d3d0c300130960c2bb5a50;hb=d01ff82689c702144f7f9cda95fd3d7070fbe563;hp=0b2b67196dca78b948e85fba06615d85ddaf72b1;hpb=ddcd7c5ea5a1c13516637229ca6d6270559a87cf;p=mirror%2Fdsa-puppet.git

diff --git a/modules/bacula/manifests/client.pp b/modules/bacula/manifests/client.pp
index 0b2b67196..230b29f5a 100644
--- a/modules/bacula/manifests/client.pp
+++ b/modules/bacula/manifests/client.pp
@@ -50,12 +50,24 @@ class bacula::client inherits bacula {
 		require => Package['bacula-fd'],
 		notify  => Service['bacula-fd'],
 	}
-	file { '/etc/systemd/system/bacula-fd.service.d/user.conf':
-		source	=> 'puppet:///modules/bacula/bacula-fd-systemd',
-		mode	=> '0400',
-		owner	=> root,
-		group	=> root,
-		notify	=> Service['bacula-fd'],
+	if ($::lsbmajdistrelease >= 9 and $systemd) {
+		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':