X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbacula%2Fmanifests%2Fstorage.pp;h=09f0d0de81ffe2c4e0eb9af90a6f345abedaefbb;hb=8b22735de3dd63392e79167a9c7865963f8cb5b4;hp=2db1fa2ba85c3c00c1a241449a1d9b2cd9310f96;hpb=99bd9bc7031f8142fd6cfdbeff7e9281d7b23da5;p=mirror%2Fdsa-puppet.git

diff --git a/modules/bacula/manifests/storage.pp b/modules/bacula/manifests/storage.pp
index 2db1fa2ba..09f0d0de8 100644
--- a/modules/bacula/manifests/storage.pp
+++ b/modules/bacula/manifests/storage.pp
@@ -44,17 +44,10 @@ class bacula::storage inherits bacula {
     notify  => Exec['bacula-sd restart-when-idle']
   }
 
-  ferm::rule { 'dsa-bacula-sd-v4':
-    domain      => '(ip)',
-    description => 'Allow bacula-sd access from director and clients',
-    rule        => 'proto tcp mod state state (NEW) dport (bacula-sd) @subchain \'bacula-sd\' { saddr ($HOST_DEBIAN_V4 5.153.231.125 5.153.231.126) ACCEPT; }',
-    notarule    => true,
-  }
-
-  ferm::rule { 'dsa-bacula-sd-v6':
-    domain      => '(ip6)',
-    description => 'Allow bacula-sd access from director and clients',
-    rule        => 'proto tcp mod state state (NEW) dport (bacula-sd) @subchain \'bacula-sd\' { saddr ($HOST_DEBIAN_V6) ACCEPT; }',
+  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,
   }
 
@@ -66,22 +59,22 @@ class bacula::storage inherits bacula {
   }
 
   file { "${bacula_backup_path}/Catalog":
-    ensure  => directory,
-    mode    => '0755',
-    owner   => bacula,
-    group   => bacula,
+    ensure => directory,
+    mode   => '0755',
+    owner  => bacula,
+    group  => bacula,
     ;
   }
 
   package { 'python3-psycopg2': ensure => installed }
   file { '/usr/local/bin/bacula-unlink-removed-volumes':
-    source  => 'puppet:///modules/bacula/bacula-unlink-removed-volumes',
-    mode    => '0555',
+    source => 'puppet:///modules/bacula/bacula-unlink-removed-volumes',
+    mode   => '0555',
   }
-  file { "/etc/cron.d/puppet-bacula-storage-stuff": ensure => absent, }
-  concat::fragment { 'dsa-puppet-stuff--bacula-storage':
-    target => '/etc/cron.d/dsa-puppet-stuff',
-    content  => @(EOF)
+  file { '/etc/cron.d/puppet-bacula-storage-stuff': ensure => absent, }
+  concat::fragment { 'puppet-crontab--bacula-storage':
+    target  => '/etc/cron.d/puppet-crontab',
+    content => @(EOF)
       @daily bacula chronic /usr/local/bin/bacula-unlink-removed-volumes -v
       | EOF
   }