From: Peter Palfrader <peter@palfrader.org>
Date: Tue, 24 Sep 2019 08:12:22 +0000 (+0200)
Subject: remove some commented out, dead code
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=0cac152c4e87a6e5808d6f0716c0fcc23e3e7ffc;p=mirror%2Fdsa-puppet.git

remove some commented out, dead code
---

diff --git a/modules/bacula/templates/bacula-dir.conf.erb b/modules/bacula/templates/bacula-dir.conf.erb
index e707f5e60..f660ede75 100644
--- a/modules/bacula/templates/bacula-dir.conf.erb
+++ b/modules/bacula/templates/bacula-dir.conf.erb
@@ -90,7 +90,6 @@ FileSet {
   Include {
     Options {
       signature = SHA1
-      #compression = GZIP9
     }
     File = "/var/lib/bacula/bacula.sql.gz"
   }
@@ -178,7 +177,6 @@ JobDefs {
   Level = Incremental
   FileSet = "Standard Set"
   Accurate = yes
-  # Schedule = "WeeklyCycle"
   Messages = Standard
   Max Full Interval = 50 days
   Priority = 10
diff --git a/modules/bacula/templates/bacula-fd.conf.erb b/modules/bacula/templates/bacula-fd.conf.erb
index 861209de9..547a06d9d 100644
--- a/modules/bacula/templates/bacula-fd.conf.erb
+++ b/modules/bacula/templates/bacula-fd.conf.erb
@@ -49,7 +49,6 @@ FileDaemon {
   Plugin Directory = /usr/lib/bacula
 <%- end -%>
   Maximum Concurrent Jobs = 20
-  #Maximum Network Buffer Size = 524288
 
   TLS Enable = yes
   TLS Require = yes
diff --git a/modules/bacula/templates/bacula-sd.conf.erb b/modules/bacula/templates/bacula-sd.conf.erb
index 7e7176f24..7c0375f15 100644
--- a/modules/bacula/templates/bacula-sd.conf.erb
+++ b/modules/bacula/templates/bacula-sd.conf.erb
@@ -34,7 +34,6 @@ Storage {
   TLS Enable = yes
   TLS Require = yes
   TLS Verify Peer = yes
-  # TLS Allowed CN = "clientcerts/<%= @bacula_director_address %>"
   TLS CA Certificate File = "<%= @bacula_ca_path %>"
   # This is a server certificate, used for incoming connections.
   TLS Certificate = "<%= @bacula_ssl_server_cert %>"
diff --git a/modules/bacula/templates/per-client.conf.erb b/modules/bacula/templates/per-client.conf.erb
index ab1a7aaca..213bfe2e1 100644
--- a/modules/bacula/templates/per-client.conf.erb
+++ b/modules/bacula/templates/per-client.conf.erb
@@ -13,7 +13,6 @@ Job {
   Differential Backup Pool = "pooldiff-<%= @bacula_pool_name %>-<%= @client %>"
   Incremental Backup Pool = "poolinc-<%= @bacula_pool_name %>-<%= @client %>"
 
-  #Rerun Failed Levels = yes
   Reschedule On Error = yes
   Reschedule Interval = 4 hours
   Reschedule Times = 2
diff --git a/modules/bacula/templates/storage-per-client.conf.erb b/modules/bacula/templates/storage-per-client.conf.erb
index 6403bea26..e7c9ceec1 100644
--- a/modules/bacula/templates/storage-per-client.conf.erb
+++ b/modules/bacula/templates/storage-per-client.conf.erb
@@ -12,5 +12,4 @@ Device {
   AutomaticMount = yes;
   RemovableMedia = no;
   AlwaysOpen = no;
-  #Maximum Network Buffer Size = 524288
 }