From: Peter Palfrader <peter@palfrader.org>
Date: Tue, 24 Sep 2019 21:27:23 +0000 (+0200)
Subject: And storage name is sd local
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=fedc1fec6081de9840d9042c6c67d921f17267ac;p=mirror%2Fdsa-puppet.git

And storage name is sd local
---

diff --git a/modules/bacula/manifests/init.pp b/modules/bacula/manifests/init.pp
index 5a5959a29..8ebc4ee5c 100644
--- a/modules/bacula/manifests/init.pp
+++ b/modules/bacula/manifests/init.pp
@@ -4,7 +4,6 @@
 class bacula (
   String  $bacula_operator_email      = 'bacula-reports@admin.debian.org',
   String  $bacula_director_name       = 'debian-dir',
-  String  $bacula_storage_name        = 'debian-sd',
   String  $bacula_monitor_name        = 'debian-mon',
 
   String  $bacula_director_address    = 'dinis.debian.org',
diff --git a/modules/bacula/manifests/storage.pp b/modules/bacula/manifests/storage.pp
index 69e8ddc44..874efec92 100644
--- a/modules/bacula/manifests/storage.pp
+++ b/modules/bacula/manifests/storage.pp
@@ -1,14 +1,16 @@
 # 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
+# @param backup_path      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
+# @param storage_name     bacula name of this sd instance
 class bacula::storage (
   String $backup_path     = '/srv/bacula',
   String $filestor_device = 'FileStorage',
   String $filestor_name   = 'File',
   Integer $port_sd        = 9103,
+  String $storage_name    = "${::fqdn}-sd",
 ) inherits bacula {
   $storage_secret = hkdf('/etc/puppet/secret', "bacula-sd-${::fqdn}")
 
diff --git a/modules/bacula/templates/bacula-sd.conf.erb b/modules/bacula/templates/bacula-sd.conf.erb
index f131f5a8e..f9bcdfee7 100644
--- a/modules/bacula/templates/bacula-sd.conf.erb
+++ b/modules/bacula/templates/bacula-sd.conf.erb
@@ -5,7 +5,7 @@
 #  For Bacula release 5.0.1 (24 February 2010) -- debian 5.0.4
 
 Storage {
-  Name = <%= @bacula_storage_name %>
+  Name = <%= @storage_name %>
   SDAddresses = {
     # bacula, on Debian 9 (stretch), does not resolve a single name
     # to both v4 and v6 addresses.  Se we can't just say