From: Peter Palfrader <peter@palfrader.org>
Date: Fri, 24 Aug 2012 11:09:03 +0000 (+0000)
Subject: Revert "bacula: spooling"
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=76027433ad7f9afab3673ed6263df5c52de222ca;hp=30856dc322bf75ad5120d6c780007e6b0877b688;p=dsa-puppet.git

Revert "bacula: spooling"

This reverts commit 5b5fb50250f554ae2c9fa6eda0dc59282cd39264.

Conflicts:

	modules/bacula/templates/bacula-sd.conf.erb
---

diff --git a/modules/bacula/templates/bacula-dir.conf.erb b/modules/bacula/templates/bacula-dir.conf.erb
index 95ab8584..66ff569f 100644
--- a/modules/bacula/templates/bacula-dir.conf.erb
+++ b/modules/bacula/templates/bacula-dir.conf.erb
@@ -168,7 +168,6 @@ 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
 }
 
 ########################################################################
diff --git a/modules/bacula/templates/bacula-sd.conf.erb b/modules/bacula/templates/bacula-sd.conf.erb
index ec17f56e..8cdf665e 100644
--- a/modules/bacula/templates/bacula-sd.conf.erb
+++ b/modules/bacula/templates/bacula-sd.conf.erb
@@ -35,9 +35,6 @@ Device {
   RemovableMedia = no;
   AlwaysOpen = no;
   Maximum Network Buffer Size = 4194304
-  Maximum Spool Size = 250G
-  Maximum Job Spool Size = 50G
-  Spool Directory = <%= bacula_backup_path %>/spool
 }
 
 # Send all messages to the Director,