X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbacula%2Ftemplates%2Fbacula-dir.conf.erb;fp=modules%2Fbacula%2Ftemplates%2Fbacula-dir.conf.erb;h=84a7bbf7a90c583af585d49fc76cfd45d593c82f;hb=92461482f97287c63b614ae7338594023711ce12;hp=58b9c8536eb715fd969c02b07c8dba09df28a44c;hpb=b691ceab0101d9a4032e9680abc1a8427ac45808;p=mirror%2Fdsa-puppet.git

diff --git a/modules/bacula/templates/bacula-dir.conf.erb b/modules/bacula/templates/bacula-dir.conf.erb
index 58b9c8536..84a7bbf7a 100644
--- 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 %>"
@@ -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