X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fbacula%2Fmanifests%2Fnode.pp;h=5552627ae90d0ec9c97932efde8094e22ddcad94;hb=d2f41d6cc64287591ac5c97a1fae9adb4f848d36;hp=7f594141ec39ef0b873c658f79865d9e47c46b70;hpb=6a6f323df04506d53a2d5fb8e30765ec216877d9;p=mirror%2Fdsa-puppet.git

diff --git a/modules/bacula/manifests/node.pp b/modules/bacula/manifests/node.pp
index 7f594141e..5552627ae 100644
--- a/modules/bacula/manifests/node.pp
+++ b/modules/bacula/manifests/node.pp
@@ -1,15 +1,28 @@
 define bacula::node() {
-	include bacula::director
+
+	include bacula
+
+	$bacula_pool_name         = $bacula::bacula_pool_name
+	$bacula_filestor_name     = $bacula::bacula_filestor_name
+	$bacula_filestor_device   = $bacula::bacula_filestor_device
+	$bacula_storage_address   = $bacula::bacula_storage_address
+	$bacula_storage_port      = $bacula::bacula_storage_port
+	$bacula_storage_secret    = $bacula::bacula_storage_secret
+
+	$bacula_client_port   = $bacula::bacula_client_port
+	$bacula_ca_path       = $bacula::bacula_ca_path
+	$bacula_ssl_client_cert = $bacula::bacula_ssl_client_cert
+	$bacula_ssl_client_key  = $bacula::bacula_ssl_client_key
 
 	$bacula_client_name   = "${name}-fd"
-	$bacula_client_secret = hmac('/etc/puppet/secret', "bacula-fd-${name}")
+	$bacula_client_secret = hkdf('/etc/puppet/secret', "bacula-fd-${name}")
 	$client               = $name
 
 	file { "/etc/bacula/conf.d/${name}.conf":
 		content => template('bacula/per-client.conf.erb'),
 		mode    => '0440',
 		group   => bacula,
-		notify  => Service['bacula-director']
+		notify  => Exec['bacula-director reload']
 	}
 }