X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbacula%2Fmanifests%2Fstorage.pp;h=3d60de9e736d9b908011b2f2905eede58be14151;hb=168aa3f05f914802698b8db5fdde823c4e992913;hp=f0a09df7a84b509b8a693e0df1e123ed476cf773;hpb=fbda07eb15845bda281002fe76352ba46e6c5dda;p=mirror%2Fdsa-puppet.git

diff --git a/modules/bacula/manifests/storage.pp b/modules/bacula/manifests/storage.pp
index f0a09df7a..3d60de9e7 100644
--- a/modules/bacula/manifests/storage.pp
+++ b/modules/bacula/manifests/storage.pp
@@ -1,42 +1,90 @@
+# the bacula storage node
 class bacula::storage inherits bacula {
+  package { 'bacula-sd':
+    ensure => installed
+  }
 
-  package {
-    "bacula-sd": ensure => installed;
+  service { 'bacula-sd':
+    ensure    => running,
+    enable    => true,
+    hasstatus => true,
+  }
+  dsa_systemd::override { 'bacula-sd':
+    content => @(EOT)
+      [Service]
+      Group=bacula
+      SupplementaryGroups=ssl-cert
+      | EOT
   }
 
-  service {
-    "bacula-sd":
-      ensure => running,
-      enable => true,
-      hasstatus => true,
-      ;
+  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'],
   }
-  file {
-    "/etc/bacula/bacula-sd.conf":
-      content => template("bacula/bacula-sd.conf.erb"),
-      mode => 640,
-      group => bacula,
-      notify  => Exec["bacula-sd 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']
   }
 
-  exec {
-    "bacula-sd restart":
-      path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
-      refreshonly => true;
+  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']
   }
 
-  @ferm::rule { 'dsa-bacula-sd-v4':
+  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) ACCEPT; }',
-    notarule        => true,
+    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':
+  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,
+    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 { "${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": 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
+  }
+
+  Bacula::Storage_per_node<<| |>>
 }