Split the director config coming from each node in two parts: one that comes from...

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

diff --git a/modules/bacula/manifests/storage.pp b/modules/bacula/manifests/storage.pp
index 34bd649..69e8ddc 100644 (file)
--- a/modules/bacula/manifests/storage.pp
+++ b/modules/bacula/manifests/storage.pp
@@ -1,9 +1,17 @@
 # the bacula storage node
 #
 # @param backup_path the directory where backups should be stored
+# @param filestor_device Storage device name prefix
+# @param filestor_name Storage device media type name prefix
+# @param port_sd Port for the sd to listen on
 class bacula::storage (
-  String $backup_path = '/srv/bacula',
+  String $backup_path     = '/srv/bacula',
+  String $filestor_device = 'FileStorage',
+  String $filestor_name   = 'File',
+  Integer $port_sd        = 9103,
 ) inherits bacula {
+  $storage_secret = hkdf('/etc/puppet/secret', "bacula-sd-${::fqdn}")
+
   package { 'bacula-sd':
     ensure => installed
   }
@@ -23,7 +31,7 @@ class bacula::storage (
 
   exec { 'bacula-sd restart-when-idle':
     path        => '/usr/bin:/usr/sbin:/bin:/sbin',
-    command     => "sh -c 'setsid /usr/local/sbin/bacula-idle-restart ${bacula::bacula_storage_port} bacula-sd &'",
+    command     => "sh -c 'setsid /usr/local/sbin/bacula-idle-restart ${port_sd} bacula-sd &'",
     refreshonly => true,
     subscribe   => File[$bacula::bacula_ssl_server_cert],
     require     => File['/usr/local/sbin/bacula-idle-restart'],
@@ -51,7 +59,7 @@ class bacula::storage (
   # allow access from director and fds
   ferm::rule::simple { 'dsa-bacula-sd':
     description => 'Access to the bacula-storage',
-    port        => $bacula::bacula_storage_port,
+    port        => $port_sd,
     target      => 'bacula-sd',
   }
   Ferm::Rule::Simple <<| tag == "bacula::director-to-storage::${bacula::bacula_director_address}" |>>;
@@ -77,5 +85,5 @@ class bacula::storage (
       | EOF
   }
 
-  Bacula::Storage_per_node<<| |>>
+  Bacula::Storage::Client<<| tag == "bacula::to-storage::${::fqdn}" |>>
 }