Try to wait for both network-online *and* unbound

[mirror/dsa-puppet.git] / modules / bacula / manifests / storage.pp

diff --git a/modules/bacula/manifests/storage.pp b/modules/bacula/manifests/storage.pp
index 3b1c5fb..8128fde 100644 (file)
--- a/modules/bacula/manifests/storage.pp
+++ b/modules/bacula/manifests/storage.pp
@@ -1,5 +1,20 @@
 # the bacula storage node
-class bacula::storage inherits bacula {
+#
+# @param backup_path      directory where backups should be stored
+# @param filestor_device  storage device name prefix
+# @param filestor_name    storage device media type name prefix
+# @param port_sd          port for the sd to listen on
+# @param storage_name     bacula name of this sd instance
+# @param storage_address  address of this sd instance that other instances should connect to (dns name)
+class bacula::storage (
+  String $backup_path     = '/srv/bacula',
+  String $filestor_device = 'FileStorage',
+  String $filestor_name   = 'File',
+  Integer $port_sd        = 9103,
+  String $storage_name    = "${::fqdn}-sd",
+  Stdlib::Host $storage_address = $::fqdn,
+) inherits bacula {
+
   package { 'bacula-sd':
     ensure => installed
   }
@@ -11,6 +26,8 @@ class bacula::storage inherits bacula {
   }
   dsa_systemd::override { 'bacula-sd':
     content => @(EOT)
+      [Unit]
+      After=network-online.target unbound.service
       [Service]
       Group=bacula
       SupplementaryGroups=ssl-cert
@@ -19,9 +36,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 ${port_sd} bacula-sd &'",
     refreshonly => true,
-    subscribe   => File[$bacula::bacula_ssl_server_cert],
+    subscribe   => File[$bacula::ssl_server_cert],
     require     => File['/usr/local/sbin/bacula-idle-restart'],
   }
 
@@ -40,20 +57,17 @@ class bacula::storage inherits bacula {
     purge   => true,
     force   => true,
     recurse => true,
-    source  => 'puppet:///files/empty/',
     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
-  Ferm::Rule::Simple <<| tag == 'bacula::director-to-storage' |>> {
-    port => $bacula::bacula_storage_port,
+  # allow access from director and fds
+  ferm::rule::simple { 'dsa-bacula-sd':
+    description => 'Access to the bacula-storage',
+    port        => $port_sd,
+    target      => 'bacula-sd',
   }
+  Ferm::Rule::Simple <<| tag == 'bacula::director-to-storage' |>>;
+  Ferm::Rule::Simple <<| tag == "bacula::fd-to-storage::${::fqdn}" |>>;
 
   file { '/etc/bacula/storage-conf.d/empty.conf':
     content => '',
@@ -62,14 +76,6 @@ class bacula::storage inherits bacula {
     notify  => Exec['bacula-sd restart-when-idle']
   }
 
-  file { "${bacula::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',
@@ -83,5 +89,6 @@ class bacula::storage inherits bacula {
       | EOF
   }
 
-  Bacula::Storage_per_node<<| |>>
+  Bacula::Storage::Director<<| tag == 'bacula::to-storage' |>>
+  Bacula::Storage::Client<<| tag == "bacula::to-storage::${::fqdn}" |>>
 }