X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fbacula%2Ftemplates%2Fbconsole.conf.erb;h=6f91306cfa169ad096bf5fa590de11619e43847d;hb=51c79070603003701cef47513835b6d3e41e64fc;hp=183dd531ddf8cc5a6fd96ddc55a401b0b0a11257;hpb=41eb08e7f1e2ed730846745f51c1e53a4797f613;p=mirror%2Fdsa-puppet.git diff --git a/modules/bacula/templates/bconsole.conf.erb b/modules/bacula/templates/bconsole.conf.erb index 183dd531d..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 %> - DIRport = 9101 - address = <%= @bacula_director_address %> - Password = "<%= @bacula_director_secret %>" + Name = <%= @director_name %> + DIRport = <%= @port_dir %> + 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'] %> }