From 42e20fefad3765c8635a9144dda741c23fff4b81 Mon Sep 17 00:00:00 2001
From: Peter Palfrader <peter@palfrader.org>
Date: Wed, 25 Sep 2019 11:31:24 +0200
Subject: [PATCH] Unify name of the Messages Resource

---
 modules/bacula/manifests/client/director.pp               | 2 ++
 modules/bacula/manifests/director.pp                      | 4 ++++
 modules/bacula/manifests/storage/director.pp              | 2 ++
 modules/bacula/templates/bacula-dir.conf.erb              | 6 +++---
 modules/bacula/templates/client/fd-per-director.conf.erb  | 2 +-
 modules/bacula/templates/storage/sd-per-director.conf.erb | 2 +-
 6 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/modules/bacula/manifests/client/director.pp b/modules/bacula/manifests/client/director.pp
index 4990c1175..87628a4e4 100644
--- a/modules/bacula/manifests/client/director.pp
+++ b/modules/bacula/manifests/client/director.pp
@@ -4,9 +4,11 @@
 #
 # @param director_name     bacula name of the dir instance
 # @param director_address  address of this dir instance that other instances should connect to (dns name)
+# @param messages_name   name of the Messages Resource
 define bacula::client::director(
   String $director_name,
   Stdlib::Host $director_address,
+  String $messages_name = "Msg-${director_address}", # XXX remove default
 ) {
   include bacula::client
 
diff --git a/modules/bacula/manifests/director.pp b/modules/bacula/manifests/director.pp
index 5f7fba43c..486df2e84 100644
--- a/modules/bacula/manifests/director.pp
+++ b/modules/bacula/manifests/director.pp
@@ -10,6 +10,7 @@
 # @param db_sslca       SSL CA store for DB access
 # @param director_name  bacula name of this dir instance
 # @param director_address  address of this dir instance that other instances should connect to (dns name)
+# @param messages_name   name of the Messages Resource
 class bacula::director(
   String  $db_address,
   Integer $db_port,
@@ -21,6 +22,7 @@ class bacula::director(
   Optional[String] $db_sslca = undef,
   String $director_name = "${::fqdn}-dir",
   Stdlib::Host $director_address = $::fqdn,
+  String $messages_name = "Msg-${::fqdn}",
 ) inherits bacula {
 
   # used by e.g. bconsole
@@ -34,12 +36,14 @@ class bacula::director(
     tag              => 'bacula::to-storage',
     director_name    => $director_name,
     director_address => $director_address,
+    messages_name    => $messages_name,
   }
   # let FDs know we exist
   @@bacula::client::director{ $::fqdn:
     tag              => "bacula::to-fd::${director_address}",
     director_name    => $director_name,
     director_address => $director_address,
+    messages_name    => $messages_name,
   }
 
   ensure_packages ( [
diff --git a/modules/bacula/manifests/storage/director.pp b/modules/bacula/manifests/storage/director.pp
index de4f25ef4..fabce50ae 100644
--- a/modules/bacula/manifests/storage/director.pp
+++ b/modules/bacula/manifests/storage/director.pp
@@ -4,9 +4,11 @@
 #
 # @param director_name     bacula name of the dir instance
 # @param director_address  address of this dir instance that other instances should connect to (dns name)
+# @param messages_name   name of the Messages Resource
 define bacula::storage::director(
   String $director_name,
   Stdlib::Host $director_address,
+  String $messages_name = "Msg-${director_address}", # XXX remove default
 ) {
   include bacula::storage
 
diff --git a/modules/bacula/templates/bacula-dir.conf.erb b/modules/bacula/templates/bacula-dir.conf.erb
index e94ce587c..13912fd0b 100644
--- a/modules/bacula/templates/bacula-dir.conf.erb
+++ b/modules/bacula/templates/bacula-dir.conf.erb
@@ -103,7 +103,7 @@ Catalog {
 # Message delivery                                                     #
 ########################################################################
 Messages {
-  Name = Standard
+  Name = <%= @messages_name %>
   mailcommand = "/usr/lib/bacula/bsmtp -h localhost -f \"\(Bacula\) %r\" -s \"Bacula: %t %e of %c %l\" %r"
   operatorcommand = "/usr/lib/bacula/bsmtp -h localhost -f \"\(Bacula\) %r\" -s \"Bacula: Intervention needed for %j\" %r"
   #mail on error = <%= @bacula_operator_email %> = all, !skipped
@@ -134,7 +134,7 @@ JobDefs {
   Level = Incremental
   FileSet = "Standard Set"
   Accurate = yes
-  Messages = Standard
+  Messages = <%= @messages_name %>
   Max Full Interval = 50 days
   Priority = 10
   Write Bootstrap = "/var/lib/bacula/%c.bsr"
@@ -152,7 +152,7 @@ Job {
   FileSet = "Standard Set"
   Client = <%= @some_client_name%>
   Pool = <%= @some_pool_name %>
-  Messages = Standard
+  Messages = <%= @messages_name %>
   Where = /var/tmp/bacula-restores
 }
 
diff --git a/modules/bacula/templates/client/fd-per-director.conf.erb b/modules/bacula/templates/client/fd-per-director.conf.erb
index 25daf0a2e..19c62fc6f 100644
--- a/modules/bacula/templates/client/fd-per-director.conf.erb
+++ b/modules/bacula/templates/client/fd-per-director.conf.erb
@@ -21,6 +21,6 @@ Director {
 
 # Send all messages except skipped files back to Director
 Messages {
-  Name = Msg-<%= scope['bacula::client::client_name'] %>-<%= @director_name %>
+  Name = <%= @messages_name %>
   director = <%= @director_name %> = all, !skipped, !restored
 }
diff --git a/modules/bacula/templates/storage/sd-per-director.conf.erb b/modules/bacula/templates/storage/sd-per-director.conf.erb
index 34f64232b..29a29b981 100644
--- a/modules/bacula/templates/storage/sd-per-director.conf.erb
+++ b/modules/bacula/templates/storage/sd-per-director.conf.erb
@@ -19,6 +19,6 @@ Director {
 # Send all messages to the Director,
 #
 Messages {
-  Name = Standard
+  Name = <%= @messages_name %>
   director = <%= @director_name %> = all
 }
-- 
2.20.1