X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fbacula%2Fmanifests%2Fstorage.pp;h=3d9ac3b6b20b62f3d0325522d16ab66d371a31fe;hb=ded0c1ded4865d466a989762db959114892b917f;hp=97dc4244de3c17aae957bcba70ead606b5d019ae;hpb=074f447f617f7b3cbb9dce3018d6f115ef886d77;p=mirror%2Fdsa-puppet.git

diff --git a/modules/bacula/manifests/storage.pp b/modules/bacula/manifests/storage.pp
index 97dc4244d..3d9ac3b6b 100644
--- a/modules/bacula/manifests/storage.pp
+++ b/modules/bacula/manifests/storage.pp
@@ -44,12 +44,14 @@ class bacula::storage inherits bacula {
     notify  => Exec['bacula-sd restart-when-idle']
   }
 
-  ferm::rule { 'dsa-bacula-sd':
-    domain      => '(ip ip6)',
-    description => 'Allow bacula-sd access from director and clients (i.e. all of Debian)',
-    rule        => 'proto tcp mod state state (NEW) dport (bacula-sd) @subchain \'bacula-sd\' { saddr ($HOST_DEBIAN) ACCEPT; }',
-    notarule    => true,
+  # allow access from director and fds
+  ferm::rule::simple { 'dsa-bacula-sd':
+    description => 'Access to the bacula-storage',
+    port        => $bacula::bacula_storage_port,
+    target      => 'bacula-sd',
   }
+  Ferm::Rule::Simple <<| tag == "bacula::director-to-storage::${bacula::bacula_director_address}" |>>;
+  Ferm::Rule::Simple <<| tag == "bacula::fd-to-storage::${::fqdn}" |>>;
 
   file { '/etc/bacula/storage-conf.d/empty.conf':
     content => '',