X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbacula%2Fmanifests%2Fstorage.pp;h=1e538bf17cd1f158cf00bc6d731cd5e55d6a6832;hb=3661675fcab6a1dab09910456c98f19aaa50b395;hp=7b1c1a8341a79ced3333f645a5fb1095758b8dde;hpb=e96e72674696752c5a15e7618677b704919f4dc8;p=mirror%2Fdsa-puppet.git

diff --git a/modules/bacula/manifests/storage.pp b/modules/bacula/manifests/storage.pp
index 7b1c1a834..1e538bf17 100644
--- a/modules/bacula/manifests/storage.pp
+++ b/modules/bacula/manifests/storage.pp
@@ -9,21 +9,28 @@ class bacula::storage inherits bacula {
 		enable    => true,
 		hasstatus => true,
 	}
+	systemd::override { 'bacula-sd':
+		content => @(EOT)
+			[Service]
+			Group=bacula
+			SupplementaryGroups=ssl-cert
+			| EOT
+	}
 
-	# should wait on -sd to finish current backups, then restart
-	# since it does not support reload and restarting kills running
-	# jobs
-	exec { 'bacula-sd reload':
+	exec { 'bacula-sd restart-when-idle':
 		path        => '/usr/bin:/usr/sbin:/bin:/sbin',
-		command     => 'true',
+		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    => '0640',
 		group   => bacula,
-		notify  => Service['bacula-sd']
+		notify  => Exec['bacula-sd restart-when-idle']
 	}
 
 	file { '/etc/bacula/storage-conf.d':
@@ -34,13 +41,13 @@ class bacula::storage inherits bacula {
 		force   => true,
 		recurse => true,
 		source  => 'puppet:///files/empty/',
-		notify  => Exec['bacula-sd reload']
+		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) ACCEPT; }',
+		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,
 	}
 
@@ -55,9 +62,29 @@ class bacula::storage inherits bacula {
 		content => '',
 		mode    => '0440',
 		group   => bacula,
-		notify  => Exec['bacula-sd reload']
+		notify  => Exec['bacula-sd restart-when-idle']
 	}
 
-	Bacula::Storage-per-Node<<| |>>
+	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 { 'dsa-puppet-stuff--bacula-storage':
+		target => '/etc/cron.d/dsa-puppet-stuff',
+		content  => @(EOF)
+			@daily bacula chronic /usr/local/bin/bacula-unlink-removed-volumes -v
+			| EOF
+	}
 
+	Bacula::Storage_per_node<<| |>>
 }