From: Peter Palfrader <peter@palfrader.org>
Date: Fri, 17 Aug 2012 10:40:21 +0000 (+0200)
Subject: restore template also needs a pool
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;ds=sidebyside;h=56dda10452dc0f212cdeef366cce321016b20fb4;hp=05d69fa70c8b2d84817c38adce084c787d617061;p=mirror%2Fdsa-puppet.git

restore template also needs a pool
---

diff --git a/modules/bacula/templates/bacula-dir.conf.erb b/modules/bacula/templates/bacula-dir.conf.erb
index 987170eb5..16d9ccc18 100644
--- a/modules/bacula/templates/bacula-dir.conf.erb
+++ b/modules/bacula/templates/bacula-dir.conf.erb
@@ -159,7 +159,6 @@ JobDefs {
   Level = Incremental
   FileSet = "Standard Set"
   Schedule = "WeeklyCycle"
-  Storage = <%=bacula_filestor_name%>
   Messages = Standard
   Pool = <%=bacula_pool_name%>
   Differential Backup Pool = <%=bacula_pool_name%>diff
@@ -180,7 +179,7 @@ Job {
   Type = Restore
   Client = draghi.debian.org-fd
   FileSet = "Standard Set"
-  Pool = Restore
+  Pool = <%=bacula_pool_name%>
   Messages = Standard
   Where = /var/tmp/bacula-restores
 }
@@ -191,6 +190,7 @@ Job {
 Pool {
   Name = <%= bacula_pool_name %>
   Pool Type = Backup
+  Storage = <%=bacula_filestor_name%>
   Recycle = no
   AutoPrune = yes
   Volume Retention = 1 year
@@ -204,6 +204,7 @@ Pool {
 Pool {
   Name = <%= bacula_pool_name %>diff
   Pool Type = Backup
+  Storage = <%=bacula_filestor_name%>
   Recycle = no
   AutoPrune = yes
   Volume Retention = 1 year
@@ -217,6 +218,7 @@ Pool {
 Pool {
   Name = <%= bacula_pool_name %>inc
   Pool Type = Backup
+  Storage = <%=bacula_filestor_name%>
   Recycle = no
   AutoPrune = yes
   Volume Retention = 1 year