X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbacula%2Ftemplates%2Fbacula-dir.conf.erb;h=3ceb660bfa13803ec843c2e3e8d4910bccac0bb3;hb=50edd4f679056892cd4117016e132d4b6a73702d;hp=ad433205121601fadc41f147d16deca4994fc871;hpb=dfe971b9964020f8a61e9d9e5513cb83e13728c0;p=mirror%2Fdsa-puppet.git

diff --git a/modules/bacula/templates/bacula-dir.conf.erb b/modules/bacula/templates/bacula-dir.conf.erb
index ad4332051..3ceb660bf 100644
--- a/modules/bacula/templates/bacula-dir.conf.erb
+++ b/modules/bacula/templates/bacula-dir.conf.erb
@@ -197,12 +197,12 @@ Storage {
   Media Type = "<%= bacula_filestor_name %>-catalog"
   Maximum Concurrent Jobs = 10
 
-#  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 storage daemon
-#  TLS Certificate = "<%= bacula_ssl_client_cert %>"
-#  TLS Key = "<%= bacula_ssl_client_key %>"
+  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 storage daemon
+  TLS Certificate = "<%= bacula_ssl_client_cert %>"
+  TLS Key = "<%= bacula_ssl_client_key %>"
 }
 Pool {
   Name = "poolcatalog-<%=bacula_pool_name%>"
@@ -242,11 +242,6 @@ Job {
   Write Bootstrap = "/var/lib/bacula/%n.bsr"
   Priority = 15    # run after main backup
   Pool = "poolcatalog-<%=bacula_pool_name%>"
-  RunScript {
-    RunsWhen=After
-    RunsOnClient=No
-    Console = "purge volume action=all allpools storage=%w"
-  }
 }
 
 ########################################################################