X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbacula%2Ftemplates%2Fbacula-sd.conf.erb;h=376a883e4dde83a483d34975e4b6b70a4c9ea70d;hb=6b9e31db704fa673f4935c756a754a0e4cd4f10d;hp=11e5b084b5b2a46d5a5e1d72235f4dd720877f09;hpb=388707f3641e2d1fec30a9ba60ac930bf721ea3f;p=mirror%2Fdsa-puppet.git

diff --git a/modules/bacula/templates/bacula-sd.conf.erb b/modules/bacula/templates/bacula-sd.conf.erb
index 11e5b084b..376a883e4 100644
--- a/modules/bacula/templates/bacula-sd.conf.erb
+++ b/modules/bacula/templates/bacula-sd.conf.erb
@@ -39,26 +39,23 @@ Director {
   TLS Key = "<%= bacula_ssl_server_key %>"
 }
 
-
-# To connect, the Director's bacula-dir.conf must have the
-#  same Name and MediaType.
+# Send all messages to the Director,
+# mount messages also are sent to the email address
 #
+Messages {
+  Name = Standard
+  director = <%= bacula_director_name %> = all
+}
+
 Device {
-  Name = <%= bacula_filestor_device %>
-  Media Type = <%= bacula_filestor_name %>
-  Archive Device = <%= bacula_backup_path %>
+  Name = "<%= bacula_filestor_device %>-catalog"
+  Media Type = "<%= bacula_filestor_name %>-catalog"
+  Archive Device = "<%= bacula_backup_path %>/Catalog"
   LabelMedia = yes;
   Random Access = Yes;
   AutomaticMount = yes;
   RemovableMedia = no;
   AlwaysOpen = no;
-  Maximum Network Buffer Size = 524288
 }
 
-# Send all messages to the Director,
-# mount messages also are sent to the email address
-#
-Messages {
-  Name = Standard
-  director = <%= bacula_director_name %> = all
-}
+@|"sh -c 'for f in /etc/bacula/storage-conf.d/*.conf ; do echo @${f} ; done'"