X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbacula%2Ftemplates%2Fper-client.conf.erb;h=9be2f42a97535fd7a324fdc3fd538edb064fc42b;hb=388707f3641e2d1fec30a9ba60ac930bf721ea3f;hp=f8b488d3577a42b0a3f54fa1a26a3a3c64cc290a;hpb=044fafc8663bda7e5b14b3e648d031499a84ae27;p=mirror%2Fdsa-puppet.git

diff --git a/modules/bacula/templates/per-client.conf.erb b/modules/bacula/templates/per-client.conf.erb
index f8b488d35..9be2f42a9 100644
--- a/modules/bacula/templates/per-client.conf.erb
+++ b/modules/bacula/templates/per-client.conf.erb
@@ -1,26 +1,21 @@
 ##
 ## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
-## USE: git clone git+ssh://$USER@puppet.HIDDEN.de/srv/puppet.HIDDEN.de/git/
+## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
 ##
 #  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
+  #Rerun Failed Levels = yes
+  Reschedule On Error = yes
+  Reschedule Interval = 4 hours
+  Reschedule Times = 2
+
+  Cancel Lower Level Duplicates = yes
+  Cancel Queued Duplicates = yes
 }
 
 # Client (File Services) to backup
@@ -33,4 +28,13 @@ Client {
   File Retention = 30 days            # 30 days
   Job Retention = 6 months            # six months
   AutoPrune = yes                     # Prune expired Jobs/Files
+
+  Heartbeat Interval = 180
+
+  TLS Enable = yes
+  TLS Require = yes
+  TLS CA Certificate File = "<%= bacula_ca_path %>"
+  # This is a client certificate, used by the director to connect to the client's file daemon
+  TLS Certificate = "<%= bacula_ssl_client_cert %>"
+  TLS Key = "<%= bacula_ssl_client_key %>"
 }