X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbacula%2Ftemplates%2Fbacula-sd.conf.erb;h=376a883e4dde83a483d34975e4b6b70a4c9ea70d;hb=b529b139a60ea8355089511737c8264185d8d074;hp=a22d7fc15fdf1350e8048dda774e0d7889388b55;hpb=9e485b9a9b7529146aa87a6470214c6cc419a65b;p=mirror%2Fdsa-puppet.git

diff --git a/modules/bacula/templates/bacula-sd.conf.erb b/modules/bacula/templates/bacula-sd.conf.erb
index a22d7fc15..376a883e4 100644
--- a/modules/bacula/templates/bacula-sd.conf.erb
+++ b/modules/bacula/templates/bacula-sd.conf.erb
@@ -5,41 +5,57 @@
 #  For Bacula release 5.0.1 (24 February 2010) -- debian 5.0.4
 
 Storage {
-  Name = <%=bacula_storage_name%>
-  SDPort = <%=bacula_storage_port%>
+  Name = <%= bacula_storage_name %>
+  SDPort = <%= bacula_storage_port %>
   WorkingDirectory = "/var/lib/bacula"
   Pid Directory = "/var/run/bacula"
   Maximum Concurrent Jobs = 21
-  SDAddress = <%=bacula_storage_address%>
+  SDAddress = <%= bacula_storage_address %>
+  Heartbeat Interval = 180
+
+  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 %>"
+  TLS Key = "<%= bacula_ssl_server_key %>"
 }
 
 # List Directors who are permitted to contact Storage daemon
 #
 Director {
-  Name = <%=bacula_director_name%>
-  Password = "<%=bacula_storage_secret%>"
-}
+  Name = <%= bacula_director_name %>
+  Password = "<%= bacula_storage_secret %>"
 
+  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 director connections.
+  TLS Certificate = "<%= bacula_ssl_server_cert %>"
+  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 = 65536
 }
 
-# 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'"