X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbacula%2Fmanifests%2Fstorage.pp;h=0a445e0fe521431142160cf3a1aaadf3041bb334;hb=0399c6165ed6ff265f460e8e8dde99a322615b77;hp=4ed59928c5b4cab057f1db1bf15fabaf038e71c9;hpb=820c1c410cb381be3af94859695658cd093b8829;p=mirror%2Fdsa-puppet.git

diff --git a/modules/bacula/manifests/storage.pp b/modules/bacula/manifests/storage.pp
index 4ed59928c..0a445e0fe 100644
--- a/modules/bacula/manifests/storage.pp
+++ b/modules/bacula/manifests/storage.pp
@@ -14,7 +14,6 @@ class bacula::storage (
   String $storage_name    = "${::fqdn}-sd",
   Stdlib::Host $storage_address = $::fqdn,
 ) inherits bacula {
-  $storage_secret = hkdf('/etc/puppet/secret', "bacula-sd-${::fqdn}")
 
   package { 'bacula-sd':
     ensure => installed
@@ -56,7 +55,6 @@ class bacula::storage (
     purge   => true,
     force   => true,
     recurse => true,
-    source  => 'puppet:///files/empty/',
     notify  => Exec['bacula-sd restart-when-idle']
   }
 
@@ -66,7 +64,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':
@@ -89,5 +87,6 @@ class bacula::storage (
       | EOF
   }
 
+  Bacula::Storage::Director<<| tag == 'bacula::to-storage' |>>
   Bacula::Storage::Client<<| tag == "bacula::to-storage::${::fqdn}" |>>
 }