X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbacula%2Fmanifests%2Fstorage_per_node.pp;h=e6f8425829b9d3a092cc3bdc7dc0ed0275645d8c;hb=710c80f43aed35f4c0f061274b525ae422392975;hp=0a009456ca0e4210f3f21e442389482ecf3f4c2b;hpb=249b713a08d35bffb1cd52739be6f5808baa5a5f;p=mirror%2Fdsa-puppet.git

diff --git a/modules/bacula/manifests/storage_per_node.pp b/modules/bacula/manifests/storage_per_node.pp
index 0a009456c..e6f842582 100644
--- a/modules/bacula/manifests/storage_per_node.pp
+++ b/modules/bacula/manifests/storage_per_node.pp
@@ -1,27 +1,26 @@
+# bacula storage for node.  This is stored config by a client, collected on the storage
 define bacula::storage_per_node() {
+  include bacula::storage
 
-	include bacula
+  $bacula_filestor_device = $bacula::bacula_filestor_device
+  $bacula_filestor_name   = $bacula::bacula_filestor_name
 
-	$bacula_filestor_device = $bacula::bacula_filestor_device
-	$bacula_filestor_name   = $bacula::bacula_filestor_name
-	$bacula_backup_path     = $bacula::bacula_backup_path
+  $bacula_client_name   = "${name}-fd"
+  $client               = $name
 
-	$bacula_client_name   = "${name}-fd"
-	$client               = $name
-
-	file {
-		"/etc/bacula/storage-conf.d/${name}.conf":
-			content => template('bacula/storage-per-client.conf.erb'),
-			mode    => '0440',
-			group   => bacula,
-			notify  => Exec['bacula-sd restart-when-idle'],
-			;
-		"${bacula_backup_path}/${name}":
-			ensure  => directory,
-			mode    => '0755',
-			owner   => bacula,
-			group   => bacula,
-			;
-	}
+  file {
+    "/etc/bacula/storage-conf.d/${name}.conf":
+      content => template('bacula/storage-per-client.conf.erb'),
+      mode    => '0440',
+      group   => bacula,
+      notify  => Exec['bacula-sd restart-when-idle'],
+      ;
+    "${bacula::storage::backup_path}/${name}":
+      ensure => directory,
+      mode   => '0755',
+      owner  => bacula,
+      group  => bacula,
+      ;
+  }
 }