X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbacula%2Fmanifests%2Fstorage.pp;h=9f72e0e0d1065af5d66dd49ea4b3ce45125d271e;hb=c49eef3b8c20869a6c3443c8f52a8554008713de;hp=310d60c4b6eae9f702a4f28fb6f8386869b63c19;hpb=ecf49986ffb2a593ab8d28b7c2e511fc84ef3cef;p=mirror%2Fdsa-puppet.git

diff --git a/modules/bacula/manifests/storage.pp b/modules/bacula/manifests/storage.pp
index 310d60c4b..9f72e0e0d 100644
--- a/modules/bacula/manifests/storage.pp
+++ b/modules/bacula/manifests/storage.pp
@@ -9,12 +9,19 @@ class bacula::storage inherits bacula {
 		enable    => true,
 		hasstatus => true,
 	}
+	dsa_systemd::override { 'bacula-sd':
+		content => @(EOT)
+			[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['/etc/ssl/debian/certs/thishost.crt'],
+		subscribe   => File[$bacula_ssl_server_cert],
 		require     => File['/usr/local/sbin/bacula-idle-restart'],
 	}
 
@@ -40,7 +47,7 @@ class bacula::storage inherits bacula {
 	@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,
 	}
 
@@ -58,6 +65,26 @@ class bacula::storage inherits bacula {
 		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<<| |>>
 }