X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbacula%2Fmanifests%2Fstorage.pp;h=ca41a4637e4c6c75eee4253f467aa6a2358081b8;hb=06a0afd1b2b90b203e73bc3551ff4a00d0a03e04;hp=2b8ed3f9e2e5ce7c2f0ad7a203619b02531bf2e5;hpb=5419a3761db7fb6dbf42a0097275f9723f7fa910;p=mirror%2Fdsa-puppet.git

diff --git a/modules/bacula/manifests/storage.pp b/modules/bacula/manifests/storage.pp
index 2b8ed3f9e..ca41a4637 100644
--- a/modules/bacula/manifests/storage.pp
+++ b/modules/bacula/manifests/storage.pp
@@ -18,7 +18,6 @@ class bacula::storage (
   Boolean $has_ipv4        = $bacula::public_addresses.any |$addr| { $addr =~ Stdlib::IP::Address::V4 },
   Boolean $has_ipv6        = $bacula::public_addresses.any |$addr| { $addr =~ Stdlib::IP::Address::V6 },
 ) inherits bacula {
-  $storage_secret = hkdf('/etc/puppet/secret', "bacula-sd-${::fqdn}")
 
   package { 'bacula-sd':
     ensure => installed
@@ -60,7 +59,6 @@ class bacula::storage (
     purge   => true,
     force   => true,
     recurse => true,
-    source  => 'puppet:///files/empty/',
     notify  => Exec['bacula-sd restart-when-idle']
   }
 
@@ -70,7 +68,7 @@ class bacula::storage (
     port        => $port_sd,
     target      => 'bacula-sd',
   }
-  Ferm::Rule::Simple <<| tag == "bacula::director-to-storage::${bacula::bacula_director_address}" |>>;
+  Ferm::Rule::Simple <<| tag == 'bacula::director-to-storage' |>>;
   Ferm::Rule::Simple <<| tag == "bacula::fd-to-storage::${::fqdn}" |>>;
 
   file { '/etc/bacula/storage-conf.d/empty.conf':
@@ -93,5 +91,6 @@ class bacula::storage (
       | EOF
   }
 
+  Bacula::Storage::Director<<| tag == 'bacula::to-storage' |>>
   Bacula::Storage::Client<<| tag == "bacula::to-storage::${::fqdn}" |>>
 }