X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbacula%2Ftemplates%2Fbacula-sd.conf.erb;h=f131f5a8e0686b243fc3bdf8ae138c1005c44ab3;hb=c0b5a3c72f3cbb831e7f9106f11e7e1e6c69208a;hp=f019071971e69395c376c05e117393bf1cf71107;hpb=0521725518016bbccb7a7e65ada1200044e1fa79;p=mirror%2Fdsa-puppet.git

diff --git a/modules/bacula/templates/bacula-sd.conf.erb b/modules/bacula/templates/bacula-sd.conf.erb
index f01907197..f131f5a8e 100644
--- a/modules/bacula/templates/bacula-sd.conf.erb
+++ b/modules/bacula/templates/bacula-sd.conf.erb
@@ -6,17 +6,34 @@
 
 Storage {
   Name = <%= @bacula_storage_name %>
-  SDPort = <%= @bacula_storage_port %>
+  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 scope.lookupvar('deprecated::nodeinfo')['misc']['has_v4_ldap'] -%>
+    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 = <%= @bacula_storage_address %>
+      port = <%= @port_sd %>
+    }
+    <%- end -%>
+    <%- if scope.lookupvar('deprecated::nodeinfo')['misc']['has_v6_ldap'] -%>
+    ipv6 = {
+      addr = <%= @bacula_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 = 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 %>"
   # This is a server certificate, used for incoming connections.
   TLS Certificate = "<%= @bacula_ssl_server_cert %>"
@@ -27,7 +44,7 @@ Storage {
 #
 Director {
   Name = <%= @bacula_director_name %>
-  Password = "<%= @bacula_storage_secret %>"
+  Password = "<%= @storage_secret %>"
 
   TLS Enable = yes
   TLS Require = yes
@@ -47,15 +64,4 @@ Messages {
   director = <%= @bacula_director_name %> = all
 }
 
-Device {
-  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;
-}
-
 @|"sh -c 'for f in /etc/bacula/storage-conf.d/*.conf ; do echo @${f} ; done'"