X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbacula%2Fmanifests%2Fstorage.pp;h=2ac7e7d06f9be28ee14210bd5896bb4a9e0b40c7;hb=1ef5d32e93c4c8e455c436e944c49e755389bb56;hp=09614309f1422f13410d58091c7776be2f093279;hpb=6c1a1439233b3ba7117595b6596549f4c3b012d3;p=mirror%2Fdsa-puppet.git

diff --git a/modules/bacula/manifests/storage.pp b/modules/bacula/manifests/storage.pp
index 09614309f..2ac7e7d06 100644
--- a/modules/bacula/manifests/storage.pp
+++ b/modules/bacula/manifests/storage.pp
@@ -14,7 +14,7 @@ class bacula::storage inherits bacula {
 		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'],
 	}
 
@@ -23,7 +23,7 @@ class bacula::storage inherits bacula {
 		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':
@@ -40,7 +40,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 +58,14 @@ class bacula::storage inherits bacula {
 		notify  => Exec['bacula-sd restart-when-idle']
 	}
 
+	file { "${bacula_backup_path}/Catalog":
+		ensure  => directory,
+		mode    => '0755',
+		owner   => bacula,
+		group   => bacula,
+		;
+	}
+
 	Bacula::Storage-per-Node<<| |>>
 
 }