X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbacula%2Fmanifests%2Fstorage.pp;h=69e8ddc44c326fd80352fd7aac21c5c74779091f;hb=e272b442942830a6eed50748eb63aa3b6318ca2b;hp=c2b6886d90461255a5b6619d0cfc7eef7039f443;hpb=3bd8e749b9f67f269b6be35438a7b9f34fbd1e02;p=mirror%2Fdsa-puppet.git

diff --git a/modules/bacula/manifests/storage.pp b/modules/bacula/manifests/storage.pp
index c2b6886d9..69e8ddc44 100644
--- a/modules/bacula/manifests/storage.pp
+++ b/modules/bacula/manifests/storage.pp
@@ -3,11 +3,15 @@
 # @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 $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
   }
@@ -27,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'],
@@ -55,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}" |>>;