X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbacula%2Ftemplates%2Fbacula-sd.conf.erb;h=7e7176f2465398496dc91d08ddef8ce96dc89bf6;hb=dbcdb9d9a519274894d87ed1f4dd9b5393da06b1;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..7e7176f24 100644
--- a/modules/bacula/templates/bacula-sd.conf.erb
+++ b/modules/bacula/templates/bacula-sd.conf.erb
@@ -6,11 +6,29 @@
 
 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 = <%= @bacula_storage_port %>
+    }
+    <%- end -%>
+    <%- if scope.lookupvar('deprecated::nodeinfo')['misc']['has_v6_ldap'] -%>
+    ipv6 = {
+      addr = <%= @bacula_storage_address %>
+      port = <%= @bacula_storage_port %>
+    }
+    <%- 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