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=e16588c959c75f0606826f1a25a3abc67e5a2ce1;hpb=b95e16fee732e907a6e7116ca3f347cbe62cd01c;p=mirror%2Fdsa-puppet.git

diff --git a/modules/bacula/templates/bacula-sd.conf.erb b/modules/bacula/templates/bacula-sd.conf.erb
index e16588c95..7e7176f24 100644
--- a/modules/bacula/templates/bacula-sd.conf.erb
+++ b/modules/bacula/templates/bacula-sd.conf.erb
@@ -10,7 +10,7 @@ Storage {
     # 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'] -%>
+    <%- 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.
@@ -18,7 +18,7 @@ Storage {
       port = <%= @bacula_storage_port %>
     }
     <%- end -%>
-    <%- if scope.lookupvar('site::nodeinfo')['misc']['has_v6_ldap'] -%>
+    <%- if scope.lookupvar('deprecated::nodeinfo')['misc']['has_v6_ldap'] -%>
     ipv6 = {
       addr = <%= @bacula_storage_address %>
       port = <%= @bacula_storage_port %>
@@ -26,7 +26,8 @@ Storage {
     <%- end -%>
   }
   WorkingDirectory = "/var/lib/bacula"
-  Pid Directory = "/var/run/bacula"
+  Pid Directory = "/run/bacula"
+  Plugin Directory = "/usr/lib/bacula"
   Maximum Concurrent Jobs = 21
   Heartbeat Interval = 60