X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbacula%2Ftemplates%2Fbacula-dir.conf.erb;h=95ab8584dacbe74066a7e139391edd07880f9c70;hb=1842c3466ee92bb4f17654fda73f182f8b2fe12a;hp=987170eb5848069a0e4bb135c07a4483dad69182;hpb=d0fa36fc169681b0e1c413d20179f5176467703d;p=mirror%2Fdsa-puppet.git

diff --git a/modules/bacula/templates/bacula-dir.conf.erb b/modules/bacula/templates/bacula-dir.conf.erb
index 987170eb5..95ab8584d 100644
--- a/modules/bacula/templates/bacula-dir.conf.erb
+++ b/modules/bacula/templates/bacula-dir.conf.erb
@@ -97,9 +97,9 @@ Schedule {
 ########################################################################
 Catalog {
   Name = MyCatalog
-  dbname = bacula;
-  DB Address = "<%= bacula_db_address %>";
-  DB Port = <%= bacula_db_port %>;
+  dbname = "service = bacula";
+  #DB Address = "<%= bacula_db_address %>";
+  #DB Port = <%= bacula_db_port %>;
   dbuser = "bacula";
   dbpassword = "<%= bacula_db_secret %>"
 }
@@ -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
@@ -169,6 +168,7 @@ JobDefs {
   Write Bootstrap = "/var/lib/bacula/%c.bsr"
   Maximum Concurrent Jobs = 20
   Client Run After Job = "/usr/local/sbin/postbaculajob -c \"%c\" -d \"%d\" -i \"%i\" -l \"%l\" -n \"%n\" -o /var/log/bacula-main.log"
+  SpoolData = yes
 }
 
 ########################################################################
@@ -180,7 +180,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 +191,7 @@ Job {
 Pool {
   Name = <%= bacula_pool_name %>
   Pool Type = Backup
+  Storage = <%=bacula_filestor_name%>
   Recycle = no
   AutoPrune = yes
   Volume Retention = 1 year
@@ -204,6 +205,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 +219,7 @@ Pool {
 Pool {
   Name = <%= bacula_pool_name %>inc
   Pool Type = Backup
+  Storage = <%=bacula_filestor_name%>
   Recycle = no
   AutoPrune = yes
   Volume Retention = 1 year