Unify name of the Messages Resource

[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 db41540..13912fd 100644 (file)
--- a/modules/bacula/templates/bacula-dir.conf.erb
+++ b/modules/bacula/templates/bacula-dir.conf.erb
@@ -10,24 +10,24 @@
 ########################################################################
 
 Director {
-  Name = <%= @bacula_director_name %>
+  Name = <%= @director_name %>
   Description = <%= @hostname %> - <%= @domain %> Bacula Director
   QueryFile = "/etc/bacula/scripts/query.sql"
   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 = <%= @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,14 +96,14 @@ Catalog {
   dbsslca = "<%= @db_sslca %>";
 <% end %>
   dbuser = "<%= @db_user %>";
-  dbpassword = "<%= @bacula_db_secret %>"
+  dbpassword = "<%= @db_password %>"
 }
 
 ########################################################################
 # Message delivery                                                     #
 ########################################################################
 Messages {
-  Name = Standard
+  Name = <%= @messages_name %>
   mailcommand = "/usr/lib/bacula/bsmtp -h localhost -f \"\(Bacula\) %r\" -s \"Bacula: %t %e of %c %l\" %r"
   operatorcommand = "/usr/lib/bacula/bsmtp -h localhost -f \"\(Bacula\) %r\" -s \"Bacula: Intervention needed for %j\" %r"
   #mail on error = <%= @bacula_operator_email %> = all, !skipped
@@ -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                               #
 ########################################################################
@@ -143,7 +134,7 @@ JobDefs {
   Level = Incremental
   FileSet = "Standard Set"
   Accurate = yes
-  Messages = Standard
+  Messages = <%= @messages_name %>
   Max Full Interval = 50 days
   Priority = 10
   Write Bootstrap = "/var/lib/bacula/%c.bsr"
@@ -158,10 +149,10 @@ JobDefs {
 Job {
   Name = "RestoreFiles"
   Type = Restore
-  Client = <%=@bacula_director_address%>-fd
   FileSet = "Standard Set"
-  Pool = poolfull-<%=@bacula_pool_name%>-<%=@bacula_director_address%>
-  Messages = Standard
+  Client = <%= @some_client_name%>
+  Pool = <%= @some_pool_name %>
+  Messages = <%= @messages_name %>
   Where = /var/tmp/bacula-restores
 }