X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbacula%2Fmanifests%2Fclient.pp;h=d016e0d0d8b79a424aa4defa8c723b498aceb8aa;hb=932d221f11de1bd4614c669c3f613d4c29213c7a;hp=66c4326713fb634f375fd034e9413a7d56d62bd9;hpb=993902afaabd8e7eb7823ecb4ae5ae730104f64f;p=mirror%2Fdsa-puppet.git

diff --git a/modules/bacula/manifests/client.pp b/modules/bacula/manifests/client.pp
index 66c432671..d016e0d0d 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,24 +50,25 @@ class bacula::client inherits bacula {
 		require => Package['bacula-fd'],
 		notify  => Service['bacula-fd'],
 	}
-	if $::lsbmajdistrelease >= 9 {
-		file { '/etc/systemd/system/bacula-fd.service.d':
-			ensure	=> directory,
-			mode	=> '0755',
-			owner	=> root,
-			group	=> root,
-		}
+	if (versioncmp($::lsbmajdistrelease, '9') >= 0 and $systemd) {
+		# old name for the override content
 		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'],
+			ensure	=> absent,
+		}
+		systemd::override { 'bacula-fd':
+			content => @(EOT)
+				[Service]
+				ExecStart=
+				ExecStart=/usr/sbin/bacula-fd -c $CONFIG -f -u bacula -k
+				| EOT
 		}
 	} else {
 		file { '/etc/systemd/system/bacula-fd.service.d/user.conf':
 			ensure	=> absent,
 		}
+		systemd::override { 'bacula-fd':
+			ensure	=> absent,
+		}
 	}
 
 	@ferm::rule { 'dsa-bacula-fd-v4':