X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbacula%2Fmanifests%2Fclient.pp;h=2918a7938a79c1bc28208192ceff636a4716dce9;hb=bf858ecd5be0fb15fefe18c70f59ed6e9db23250;hp=81db8712c5627623259fc05231c012fe6e242773;hpb=d3619a7f24c33ccb40bb762d31761c3c82d64922;p=mirror%2Fdsa-puppet.git

diff --git a/modules/bacula/manifests/client.pp b/modules/bacula/manifests/client.pp
index 81db8712c..2918a7938 100644
--- a/modules/bacula/manifests/client.pp
+++ b/modules/bacula/manifests/client.pp
@@ -1,5 +1,5 @@
 class bacula::client inherits bacula {
-	@@bacula::storage-per-node { $::fqdn: }
+	@@bacula::storage_per_node { $::fqdn: }
 
 	if ! getfromhash($site::nodeinfo, 'not-bacula-client') {
 		@@bacula::node { $::fqdn:
@@ -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 (versioncmp($::lsbmajdistrelease, '9') >= 0 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':