X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbacula%2Ftemplates%2Fbacula-dir.conf.erb;h=5d512e643f13f5082f9741906022f9c99b683c78;hb=f038008e8029f30cdfd5c1c911596ff70a20fbff;hp=db41540a84bc330dd3dd08726dc1005c8fbf41ed;hpb=fc79f92600028a6dea9d8dc67c78247a0cd2d62f;p=mirror%2Fdsa-puppet.git

diff --git a/modules/bacula/templates/bacula-dir.conf.erb b/modules/bacula/templates/bacula-dir.conf.erb
index db41540a8..5d512e643 100644
--- a/modules/bacula/templates/bacula-dir.conf.erb
+++ b/modules/bacula/templates/bacula-dir.conf.erb
@@ -16,12 +16,12 @@ Director {
   WorkingDirectory = "/var/lib/bacula"
   PidDirectory = "/run/bacula"
   Maximum Concurrent Jobs = 20
-  Password = "<%= @bacula_director_secret %>"
+  Password = "<%= @director_secret %>"
   Messages = Daemon
   DirAddresses = {
      # Always have localhost in, then the configured IP
-     ip = { addr = 127.0.0.1; port = 9101 }
-     ip = { addr = <%=@bacula_director_address%>; port = <%=@bacula_director_port%> }
+     ip = { addr = 127.0.0.1; port = <%= @port_dir %> }
+     ip = { addr = <%=@bacula_director_address%>; port = <%= @port_dir %> }
   }
 
   TLS Enable = yes
@@ -160,7 +160,7 @@ Job {
   Type = Restore
   Client = <%=@bacula_director_address%>-fd
   FileSet = "Standard Set"
-  Pool = poolfull-<%=@bacula_pool_name%>-<%=@bacula_director_address%>
+  Pool = <%= @some_pool_name %>
   Messages = Standard
   Where = /var/tmp/bacula-restores
 }