Make it work with jessie, III

[dsa-puppet.git] / modules / bacula / manifests / node.pp

diff --git a/modules/bacula/manifests/node.pp b/modules/bacula/manifests/node.pp
index 8286f423e2b9ddd1bbe0aca23edff4e0b9cc8793..fbbfbd215447ac4a8d2c94d904747ae65de4f69e 100644 (file)
--- a/modules/bacula/manifests/node.pp
+++ b/modules/bacula/manifests/node.pp
@@ -1,13 +1,35 @@
 define bacula::node() {
+
+       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']
+       }
+
+       file { "/etc/bacula/storages-list.d/${name}.storage":
+               content => "$bacula::bacula_filestor_name-$client\n",
+               mode    => '0440',
+               group   => bacula,
+               notify  => Exec['bacula-director reload']
        }
 }