X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbacula%2Fmanifests%2Fstorage.pp;h=34bd6491be13d56f0646af082dcaf0275ca08064;hb=710c80f43aed35f4c0f061274b525ae422392975;hp=63de0de3e805385e3222d6c53a141c592573ba68;hpb=93adaa925209eb347451bf8faf2799c2f59ed968;p=mirror%2Fdsa-puppet.git

diff --git a/modules/bacula/manifests/storage.pp b/modules/bacula/manifests/storage.pp
index 63de0de3e..34bd6491b 100644
--- a/modules/bacula/manifests/storage.pp
+++ b/modules/bacula/manifests/storage.pp
@@ -1,5 +1,9 @@
 # the bacula storage node
-class bacula::storage inherits bacula {
+#
+# @param backup_path the directory where backups should be stored
+class bacula::storage (
+  String $backup_path = '/srv/bacula',
+) inherits bacula {
   package { 'bacula-sd':
     ensure => installed
   }
@@ -19,9 +23,9 @@ class bacula::storage inherits bacula {
 
   exec { 'bacula-sd restart-when-idle':
     path        => '/usr/bin:/usr/sbin:/bin:/sbin',
-    command     => 'sh -c "setsid /usr/local/sbin/bacula-idle-restart sd &"',
+    command     => "sh -c 'setsid /usr/local/sbin/bacula-idle-restart ${bacula::bacula_storage_port} bacula-sd &'",
     refreshonly => true,
-    subscribe   => File[$bacula_ssl_server_cert],
+    subscribe   => File[$bacula::bacula_ssl_server_cert],
     require     => File['/usr/local/sbin/bacula-idle-restart'],
   }
 
@@ -44,12 +48,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 5.153.231.125 5.153.231.126) 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 => '',
@@ -58,23 +64,15 @@ class bacula::storage inherits bacula {
     notify  => Exec['bacula-sd restart-when-idle']
   }
 
-  file { "${bacula_backup_path}/Catalog":
-    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, }
+  file { '/etc/cron.d/puppet-bacula-storage-stuff': ensure => absent, }
   concat::fragment { 'puppet-crontab--bacula-storage':
-    target => '/etc/cron.d/puppet-crontab',
-    content  => @(EOF)
+    target  => '/etc/cron.d/puppet-crontab',
+    content => @(EOF)
       @daily bacula chronic /usr/local/bin/bacula-unlink-removed-volumes -v
       | EOF
   }