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

diff --git a/modules/bacula/templates/bacula-dir.conf.erb b/modules/bacula/templates/bacula-dir.conf.erb
index 5d512e643..84a7bbf7a 100644
--- a/modules/bacula/templates/bacula-dir.conf.erb
+++ b/modules/bacula/templates/bacula-dir.conf.erb
@@ -10,7 +10,7 @@
 ########################################################################
 
 Director {
-  Name = <%= @bacula_director_name %>
+  Name = <%= @director_name %>
   Description = <%= @hostname %> - <%= @domain %> Bacula Director
   QueryFile = "/etc/bacula/scripts/query.sql"
   WorkingDirectory = "/var/lib/bacula"
@@ -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 %>"
@@ -125,15 +125,6 @@ Messages {
   append = "/var/lib/bacula/log" = all
 }
 
-########################################################################
-# Console, limited                                                     #
-########################################################################
-Console {
-  Name = <%= @bacula_monitor_name %>
-  Password = "<%= @bacula_monitor_secret %>"
-  CommandACL = status, .status
-}
-
 ########################################################################
 # Jobdefinitions with defaults and stuff                               #
 ########################################################################
@@ -158,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