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 35dffb2..8128fde 100644 (file)
--- a/modules/bacula/manifests/storage.pp
+++ b/modules/bacula/manifests/storage.pp
@@ -1,79 +1,94 @@
-class bacula::storage inherits bacula {
+# the bacula storage node
+#
+# @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
-       }
+  package { 'bacula-sd':
+    ensure => installed
+  }
 
-       service { 'bacula-sd':
-               ensure    => running,
-               enable    => true,
-               hasstatus => true,
-       }
+  service { 'bacula-sd':
+    ensure    => running,
+    enable    => true,
+    hasstatus => true,
+  }
+  dsa_systemd::override { 'bacula-sd':
+    content => @(EOT)
+      [Unit]
+      After=network-online.target unbound.service
+      [Service]
+      Group=bacula
+      SupplementaryGroups=ssl-cert
+      | EOT
+  }
 
-       exec { 'bacula-sd restart-when-idle':
-               path        => '/usr/bin:/usr/sbin:/bin:/sbin',
-               command     => 'sh -c "setsid /usr/local/sbin/bacula-idle-restart sd &"',
-               refreshonly => true,
-               subscribe   => File[$bacula_ssl_server_cert],
-               require     => File['/usr/local/sbin/bacula-idle-restart'],
-       }
+  exec { 'bacula-sd restart-when-idle':
+    path        => '/usr/bin:/usr/sbin:/bin:/sbin',
+    command     => "sh -c 'setsid /usr/local/sbin/bacula-idle-restart ${port_sd} bacula-sd &'",
+    refreshonly => true,
+    subscribe   => File[$bacula::ssl_server_cert],
+    require     => File['/usr/local/sbin/bacula-idle-restart'],
+  }
 
 
-       file { '/etc/bacula/bacula-sd.conf':
-               content => template('bacula/bacula-sd.conf.erb'),
-               mode    => '0640',
-               group   => bacula,
-               notify  => Exec['bacula-sd restart-when-idle']
-       }
+  file { '/etc/bacula/bacula-sd.conf':
+    content => template('bacula/bacula-sd.conf.erb'),
+    mode    => '0640',
+    group   => bacula,
+    notify  => Exec['bacula-sd restart-when-idle']
+  }
 
-       file { '/etc/bacula/storage-conf.d':
-               ensure  => directory,
-               mode    => '0755',
-               group   => bacula,
-               purge   => true,
-               force   => true,
-               recurse => true,
-               source  => 'puppet:///files/empty/',
-               notify  => Exec['bacula-sd restart-when-idle']
-       }
+  file { '/etc/bacula/storage-conf.d':
+    ensure  => directory,
+    mode    => '0755',
+    group   => bacula,
+    purge   => true,
+    force   => true,
+    recurse => true,
+    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,
-       }
+  # 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}" |>>;
 
-       @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; }',
-               notarule    => true,
-       }
+  file { '/etc/bacula/storage-conf.d/empty.conf':
+    content => '',
+    mode    => '0440',
+    group   => bacula,
+    notify  => Exec['bacula-sd restart-when-idle']
+  }
 
-       file { '/etc/bacula/storage-conf.d/empty.conf':
-               content => '',
-               mode    => '0440',
-               group   => bacula,
-               notify  => Exec['bacula-sd restart-when-idle']
-       }
+  package { 'python3-psycopg2': ensure => installed }
+  file { '/usr/local/bin/bacula-unlink-removed-volumes':
+    source => 'puppet:///modules/bacula/bacula-unlink-removed-volumes',
+    mode   => '0555',
+  }
+  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
+  }
 
-       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',
-       }
-       file { "/etc/cron.d/puppet-bacula-storage-stuff":
-               content => "MAILTO=root\n@daily bacula chronic /usr/local/bin/bacula-unlink-removed-volumes -v\n";
-       }
-
-       Bacula::Storage_per_node<<| |>>
+  Bacula::Storage::Director<<| tag == 'bacula::to-storage' |>>
+  Bacula::Storage::Client<<| tag == "bacula::to-storage::${::fqdn}" |>>
 }