From: Peter Palfrader <peter@palfrader.org>
Date: Fri, 3 Aug 2018 07:59:54 +0000 (+0200)
Subject: bacula-sd: listen on ipv6
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=b95e16fee732e907a6e7116ca3f347cbe62cd01c;p=mirror%2Fdsa-puppet.git

bacula-sd: listen on ipv6
---

diff --git a/modules/bacula/templates/bacula-sd.conf.erb b/modules/bacula/templates/bacula-sd.conf.erb
index d724a0a37..e16588c95 100644
--- a/modules/bacula/templates/bacula-sd.conf.erb
+++ b/modules/bacula/templates/bacula-sd.conf.erb
@@ -6,8 +6,25 @@
 
 Storage {
   Name = <%= @bacula_storage_name %>
-  SDPort = <%= @bacula_storage_port %>
-  SDAddress = <%= @bacula_storage_address %>
+  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('site::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('site::nodeinfo')['misc']['has_v6_ldap'] -%>
+    ipv6 = {
+      addr = <%= @bacula_storage_address %>
+      port = <%= @bacula_storage_port %>
+    }
+    <%- end -%>
+  }
   WorkingDirectory = "/var/lib/bacula"
   Pid Directory = "/var/run/bacula"
   Maximum Concurrent Jobs = 21