I do not think empty directories need a source => (these days)

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

diff --git a/modules/bacula/templates/bacula-dir.conf.erb b/modules/bacula/templates/bacula-dir.conf.erb
index 58b9c85..e94ce58 100644 (file)
--- a/modules/bacula/templates/bacula-dir.conf.erb
+++ b/modules/bacula/templates/bacula-dir.conf.erb
@@ -21,13 +21,13 @@ Director {
   DirAddresses = {
      # Always have localhost in, then the configured IP
      ip = { addr = 127.0.0.1; port = <%= @port_dir %> }
-     ip = { addr = <%=@bacula_director_address%>; port = <%= @port_dir %> }
+     ip = { addr = <%= @director_address %>; port = <%= @port_dir %> }
   }
 
   TLS Enable = yes
   TLS Require = yes
   TLS Verify Peer = yes
-  TLS Allowed CN = "clientcerts/<%= @bacula_director_address %>"
+  TLS Allowed CN = "clientcerts/<%= @director_address %>"
   TLS CA Certificate File = "<%= @bacula_ca_path %>"
   # This is a server certificate, used for incoming console connections.
   TLS Certificate = "<%= @bacula_ssl_server_cert %>"
@@ -96,7 +96,7 @@ Catalog {
   dbsslca = "<%= @db_sslca %>";
 <% end %>
   dbuser = "<%= @db_user %>";
-  dbpassword = "<%= @bacula_db_secret %>"
+  dbpassword = "<%= @db_password %>"
 }
 
 ########################################################################
@@ -149,8 +149,8 @@ JobDefs {
 Job {
   Name = "RestoreFiles"
   Type = Restore
-  Client = <%=@bacula_director_address%>-fd
   FileSet = "Standard Set"
+  Client = <%= @some_client_name%>
   Pool = <%= @some_pool_name %>
   Messages = Standard
   Where = /var/tmp/bacula-restores