We do not need a restore job per client

diff --git a/modules/bacula/templates/bacula-dir.conf.erb b/modules/bacula/templates/bacula-dir.conf.erb
index f4e41daa2f27ee51f21a843c22c3166fe7cca257..f7f2b8dddd08456b468200e5323195696ad9d488 100644 (file)
--- a/modules/bacula/templates/bacula-dir.conf.erb
+++ b/modules/bacula/templates/bacula-dir.conf.erb
@@ -170,6 +170,20 @@ JobDefs {
   Maximum Concurrent Jobs = 20
 }
 
+########################################################################
+# Standard Restore template, to be changed by Console program          #
+#  Only one such job is needed for all Jobs/Clients/Storage ...        #
+########################################################################
+Job {
+  Name = "RestoreFiles"
+  Type = Restore
+  Client = draghi.debian.org-fd
+  FileSet = "Standard Set"
+  Pool = Restore
+  Messages = Standard
+  Where = /var/tmp/bacula-restores
+}
+
 ########################################################################
 # Pool definition                                                      #
 ########################################################################

diff --git a/modules/bacula/templates/per-client.conf.erb b/modules/bacula/templates/per-client.conf.erb
index e844425bdbca9444c76891768df4639ec4a2ddd9..e30f628f917b500214b5731ad18428f5b461d060 100644 (file)
--- a/modules/bacula/templates/per-client.conf.erb
+++ b/modules/bacula/templates/per-client.conf.erb
@@ -5,24 +5,11 @@
 #  For Bacula release 5.0.1 (24 February 2010) -- debian 5.0.4
 
 Job {
-  Name = "Backup <%= client %>"
+  Name = "<%= client %>"
   JobDefs = "Standardbackup"
   Client = <%= bacula_client_name %>
 }
 
-Job {
-  Name = "Restore <%= client %>"
-  Type = Restore
-  Client= <%= bacula_client_name %>
-  FileSet = "Standard Set"
-  Storage = <%= bacula_filestor_name %>
-  Pool = <%= bacula_pool_name %>
-  Differential Backup Pool = <%= bacula_pool_name %>diff
-  Incremental Backup Pool = <%= bacula_pool_name %>inc
-  Messages = Standard
-  Where = /var/tmp/bacula-restores
-}
-
 # Client (File Services) to backup
 Client {
   Name = <%= bacula_client_name %>