X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbacula%2Ftemplates%2Fbacula-sd.conf.erb;h=12b45aa5d5d1f23f5a4a057051ac0abe001b27a2;hb=c0a2aa7bfdcb0d56ec24e0ad98d5f248a995fd70;hp=b048f8e5fa84e05cf6822e576f5c07746853c2f7;hpb=7f9c13f5c919e065f7a39cdf40d8140384cdd5c1;p=mirror%2Fdsa-puppet.git

diff --git a/modules/bacula/templates/bacula-sd.conf.erb b/modules/bacula/templates/bacula-sd.conf.erb
index b048f8e5f..12b45aa5d 100644
--- a/modules/bacula/templates/bacula-sd.conf.erb
+++ b/modules/bacula/templates/bacula-sd.conf.erb
@@ -5,45 +5,39 @@
 #  For Bacula release 5.0.1 (24 February 2010) -- debian 5.0.4
 
 Storage {
-  Name = <%= bacula_storage_name %>
-  SDPort = <%= bacula_storage_port %>
+  Name = <%= @storage_name %>
+  SDAddresses = {
+    # bacula, on Debian 9 (stretch), does not resolve a single name
+    # to both v4 and v6 addresses.  Se we can't just say
+    # ip = { addr = <hostname> }.  Boo.
+    <%- if @has_ipv4 -%>
+    ipv4 = {
+      # use the hostname rather than the IP address from LDAP,
+      # as /etc/hosts might have a better answer in case of natted hosts.
+      addr = <%= @storage_address %>
+      port = <%= @port_sd %>
+    }
+    <%- end -%>
+    <%- if @has_ipv6 -%>
+    ipv6 = {
+      addr = <%= @storage_address %>
+      port = <%= @port_sd %>
+    }
+    <%- end -%>
+  }
   WorkingDirectory = "/var/lib/bacula"
-  Pid Directory = "/var/run/bacula"
+  Pid Directory = "/run/bacula"
+  Plugin Directory = "/usr/lib/bacula"
   Maximum Concurrent Jobs = 21
-  SDAddress = <%= bacula_storage_address %>
-  Heartbeat Interval = 180
+  Heartbeat Interval = 60
 
   TLS Enable = yes
   TLS Require = yes
   TLS Verify Peer = yes
-  # TLS Allowed CN = "clientcerts/<%= bacula_director_address %>"
-  TLS CA Certificate File = "<%= bacula_ca_path %>"
+  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 %>"
+  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 %>"
-
-  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 %>"
-}
-
-# 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'"