X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbacula%2Ftemplates%2Fbacula-sd.conf.erb;h=0a0ef7998a925cdc8b604b5daa6c67e66efa2a03;hb=5419a3761db7fb6dbf42a0097275f9723f7fa910;hp=7c0375f158460219341402f5a909d8e9c5ff3201;hpb=0cac152c4e87a6e5808d6f0716c0fcc23e3e7ffc;p=mirror%2Fdsa-puppet.git

diff --git a/modules/bacula/templates/bacula-sd.conf.erb b/modules/bacula/templates/bacula-sd.conf.erb
index 7c0375f15..0a0ef7998 100644
--- a/modules/bacula/templates/bacula-sd.conf.erb
+++ b/modules/bacula/templates/bacula-sd.conf.erb
@@ -5,23 +5,23 @@
 #  For Bacula release 5.0.1 (24 February 2010) -- debian 5.0.4
 
 Storage {
-  Name = <%= @bacula_storage_name %>
+  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 scope.lookupvar('deprecated::nodeinfo')['misc']['has_v4_ldap'] -%>
+    <%- 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 = <%= @bacula_storage_address %>
-      port = <%= @bacula_storage_port %>
+      addr = <%= @storage_address %>
+      port = <%= @port_sd %>
     }
     <%- end -%>
-    <%- if scope.lookupvar('deprecated::nodeinfo')['misc']['has_v6_ldap'] -%>
+    <%- if @has_ipv6 -%>
     ipv6 = {
-      addr = <%= @bacula_storage_address %>
-      port = <%= @bacula_storage_port %>
+      addr = <%= @storage_address %>
+      port = <%= @port_sd %>
     }
     <%- end -%>
   }
@@ -44,7 +44,7 @@ Storage {
 #
 Director {
   Name = <%= @bacula_director_name %>
-  Password = "<%= @bacula_storage_secret %>"
+  Password = "<%= @storage_secret %>"
 
   TLS Enable = yes
   TLS Require = yes
@@ -64,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'"