X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbacula%2Fmanifests%2Fclient.pp;h=05234fc9b9316dd440d50f38e822fde02d8c733e;hb=249b713a08d35bffb1cd52739be6f5808baa5a5f;hp=34e2b64dfbd11796bdfea8f51d292e42ea638150;hpb=3270c11c756e3be695bedbd967cf231c8deed1a4;p=mirror%2Fdsa-puppet.git

diff --git a/modules/bacula/manifests/client.pp b/modules/bacula/manifests/client.pp
index 34e2b64df..05234fc9b 100644
--- a/modules/bacula/manifests/client.pp
+++ b/modules/bacula/manifests/client.pp
@@ -1,8 +1,10 @@
 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::node { $::fqdn:
+			bacula_client_port => $bacula::bacula_client_port,
+		}
 	}
 
 	package { ['bacula-fd']:
@@ -48,6 +50,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,
+		}
+		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':
 		domain      => '(ip)',