Split the director config coming from each node in two parts: one that comes from...

[mirror/dsa-puppet.git] / modules / bacula / templates / bacula-sd.conf.erb

diff --git a/modules/bacula/templates/bacula-sd.conf.erb b/modules/bacula/templates/bacula-sd.conf.erb
index 7c0375f..f131f5a 100644 (file)
--- a/modules/bacula/templates/bacula-sd.conf.erb
+++ b/modules/bacula/templates/bacula-sd.conf.erb
@@ -15,13 +15,13 @@ Storage {
       # 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 %>
+      port = <%= @port_sd %>
     }
     <%- end -%>
     <%- if scope.lookupvar('deprecated::nodeinfo')['misc']['has_v6_ldap'] -%>
     ipv6 = {
       addr = <%= @bacula_storage_address %>
-      port = <%= @bacula_storage_port %>
+      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'"