From: Peter Palfrader <peter@palfrader.org>
Date: Tue, 24 Sep 2019 06:15:37 +0000 (+0200)
Subject: Qualify tags with director name.  Maybe we will support more than one in the future
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;ds=sidebyside;h=29cf2dcb6fdc15644b443d76b00098420f0bf67c;p=mirror%2Fdsa-puppet.git

Qualify tags with director name.  Maybe we will support more than one in the future
---

diff --git a/modules/bacula/manifests/client.pp b/modules/bacula/manifests/client.pp
index 023eb8825..417222423 100644
--- a/modules/bacula/manifests/client.pp
+++ b/modules/bacula/manifests/client.pp
@@ -26,7 +26,7 @@ class bacula::client(
     }
 
     # allow access from director
-    Ferm::Rule::Simple <<| tag == 'bacula::director-to-fd' |>> {
+    Ferm::Rule::Simple <<| tag == "bacula::director-to-fd::${bacula::bacula_director_address}" |>> {
       port => $bacula::bacula_client_port,
     }
   } elsif $ensure == 'absent' {
diff --git a/modules/bacula/manifests/director.pp b/modules/bacula/manifests/director.pp
index 241985bee..578251c74 100644
--- a/modules/bacula/manifests/director.pp
+++ b/modules/bacula/manifests/director.pp
@@ -113,13 +113,13 @@ class bacula::director inherits bacula {
   Concat::Fragment <<| tag == $bacula::tag_bacula_dsa_client_list |>>
 
   @@ferm::rule::simple { "bacula::director-to-fd::${::fqdn}":
-    tag         => 'bacula::director-to-fd',
+    tag         => "bacula::director-to-fd::${::fqdn}",
     description => 'Allow bacula-fd from the bacula-director',
     port        => '7', # overridden on collecting
     saddr       => $bacula::public_addresses,
   }
   @@ferm::rule::simple { "bacula::director-to-storage::${::fqdn}":
-    tag         => 'bacula::director-to-storage',
+    tag         => "bacula::director-to-storage::${::fqdn}",
     description => 'Allow bacula-storage access from the bacula-director',
     port        => '7', # overridden on collecting
     saddr       => $bacula::public_addresses,
diff --git a/modules/bacula/manifests/storage.pp b/modules/bacula/manifests/storage.pp
index 3b1c5fb2f..f581d040c 100644
--- a/modules/bacula/manifests/storage.pp
+++ b/modules/bacula/manifests/storage.pp
@@ -51,7 +51,7 @@ class bacula::storage inherits bacula {
     notarule    => true,
   }
   # allow access from director
-  Ferm::Rule::Simple <<| tag == 'bacula::director-to-storage' |>> {
+  Ferm::Rule::Simple <<| tag == "bacula::director-to-storage::${bacula::bacula_director_address}" |>> {
     port => $bacula::bacula_storage_port,
   }