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

diff --git a/modules/bacula/manifests/client.pp b/modules/bacula/manifests/client.pp
index 230b29f5a..580115d6d 100644
--- a/modules/bacula/manifests/client.pp
+++ b/modules/bacula/manifests/client.pp
@@ -1,10 +1,18 @@
 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:
 			bacula_client_port => $bacula::bacula_client_port,
 		}
+
+		@@concat::fragment { "bacula-dsa-client-list::$fqdn":
+			target => $bacula::bacula_dsa_client_list ,
+			content  => @("EOF"),
+					${fqdn}
+					| EOF
+			tag     => $bacula::tag_bacula_dsa_client_list,
+		}
 	}
 
 	package { ['bacula-fd']:
@@ -50,24 +58,25 @@ class bacula::client inherits bacula {
 		require => Package['bacula-fd'],
 		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,
-		}
+	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':