X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbacula%2Ftemplates%2Fbconsole.conf.erb;h=6f91306cfa169ad096bf5fa590de11619e43847d;hb=cd460754b2216a0531071902e1412024c594d72c;hp=8eeb3e5e8dea210667ec3cb7651ff49e49b1406d;hpb=21657d292015274ef9ab7619d2214e65998ccb69;p=mirror%2Fdsa-puppet.git diff --git a/modules/bacula/templates/bconsole.conf.erb b/modules/bacula/templates/bconsole.conf.erb index 8eeb3e5e8..6f91306cf 100644 --- a/modules/bacula/templates/bconsole.conf.erb +++ b/modules/bacula/templates/bconsole.conf.erb @@ -7,16 +7,15 @@ # Director { - Name = <%= @bacula_director_name %> + Name = <%= @director_name %> DIRport = <%= @port_dir %> - address = <%= @bacula_director_address %> + address = <%= @director_address %> Password = "<%= @director_secret %>" TLS Enable = yes TLS Require = yes - TLS CA Certificate File = "<%= @bacula_ca_path %>" - # This is a client certificate, used for console connections to the director. - TLS Certificate = "<%= @bacula_ssl_client_cert %>" - TLS Key = "<%= @bacula_ssl_client_key %>" + <%= scope['bacula::bacula_tls_ca_certificate_file'] %> + <%= scope['bacula::bacula_tls_client_certificate'] %> + <%= scope['bacula::bacula_tls_client_key'] %> }