From a71546a712323043fe4d725037df00e18db57e36 Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Wed, 25 Sep 2019 14:01:48 +0200 Subject: [PATCH] s/bacula_ca_path/bacula_ssl_ca_path/ --- modules/bacula/manifests/director/client.pp | 2 +- modules/bacula/manifests/director/client_from_storage.pp | 2 +- modules/bacula/manifests/init.pp | 2 +- modules/bacula/templates/bacula-dir.conf.erb | 2 +- modules/bacula/templates/bacula-fd.conf.erb | 2 +- modules/bacula/templates/bacula-sd.conf.erb | 2 +- modules/bacula/templates/bconsole.conf.erb | 2 +- modules/bacula/templates/client/fd-per-director.conf.erb | 2 +- .../bacula/templates/director/dir-per-client-from-storage.erb | 2 +- modules/bacula/templates/director/dir-per-client.erb | 2 +- modules/bacula/templates/storage/sd-per-director.conf.erb | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/modules/bacula/manifests/director/client.pp b/modules/bacula/manifests/director/client.pp index cbfd13984..fecbe41d3 100644 --- a/modules/bacula/manifests/director/client.pp +++ b/modules/bacula/manifests/director/client.pp @@ -18,7 +18,7 @@ define bacula::director::client ( ) { include bacula::director - $bacula_ca_path = $bacula::bacula_ca_path + $bacula_ssl_ca_path = $bacula::bacula_ssl_ca_path $bacula_ssl_client_cert = $bacula::bacula_ssl_client_cert $bacula_ssl_client_key = $bacula::bacula_ssl_client_key diff --git a/modules/bacula/manifests/director/client_from_storage.pp b/modules/bacula/manifests/director/client_from_storage.pp index b6c8eec56..ac77de942 100644 --- a/modules/bacula/manifests/director/client_from_storage.pp +++ b/modules/bacula/manifests/director/client_from_storage.pp @@ -26,7 +26,7 @@ define bacula::director::client_from_storage ( ) { include bacula::director - $bacula_ca_path = $bacula::bacula_ca_path + $bacula_ssl_ca_path = $bacula::bacula_ssl_ca_path $bacula_ssl_client_cert = $bacula::bacula_ssl_client_cert $bacula_ssl_client_key = $bacula::bacula_ssl_client_key diff --git a/modules/bacula/manifests/init.pp b/modules/bacula/manifests/init.pp index cff4087b7..eb98084b3 100644 --- a/modules/bacula/manifests/init.pp +++ b/modules/bacula/manifests/init.pp @@ -7,7 +7,7 @@ class bacula ( String $operator_email = 'root@localhost', - String $bacula_ca_path = '/etc/ssl/debian/certs/ca.crt', + String $bacula_ssl_ca_path = '/etc/ssl/debian/certs/ca.crt', String $bacula_ssl_client_cert = '/etc/ssl/debian/certs/thishost.crt', String $bacula_ssl_client_key = '/etc/ssl/private/thishost.key', String $bacula_ssl_server_cert = '/etc/ssl/debian/certs/thishost-server.crt', diff --git a/modules/bacula/templates/bacula-dir.conf.erb b/modules/bacula/templates/bacula-dir.conf.erb index b1cdeddac..c836c72b5 100644 --- a/modules/bacula/templates/bacula-dir.conf.erb +++ b/modules/bacula/templates/bacula-dir.conf.erb @@ -28,7 +28,7 @@ Director { TLS Require = yes TLS Verify Peer = yes TLS Allowed CN = "clientcerts/<%= @director_address %>" - TLS CA Certificate File = "<%= @bacula_ca_path %>" + TLS CA Certificate File = "<%= @bacula_ssl_ca_path %>" # This is a server certificate, used for incoming console connections. TLS Certificate = "<%= @bacula_ssl_server_cert %>" TLS Key = "<%= @bacula_ssl_server_key %>" diff --git a/modules/bacula/templates/bacula-fd.conf.erb b/modules/bacula/templates/bacula-fd.conf.erb index ae8912d50..2f9acda33 100644 --- a/modules/bacula/templates/bacula-fd.conf.erb +++ b/modules/bacula/templates/bacula-fd.conf.erb @@ -37,7 +37,7 @@ FileDaemon { TLS Enable = yes TLS Require = yes - TLS CA Certificate File = "<%= @bacula_ca_path %>" + TLS CA Certificate File = "<%= @bacula_ssl_ca_path %>" # This is a client certificate, used by the client to connect to the storage daemon TLS Certificate = "<%= @bacula_ssl_client_cert %>" TLS Key = "<%= @bacula_ssl_client_key %>" diff --git a/modules/bacula/templates/bacula-sd.conf.erb b/modules/bacula/templates/bacula-sd.conf.erb index 12b45aa5d..76bda9e2a 100644 --- a/modules/bacula/templates/bacula-sd.conf.erb +++ b/modules/bacula/templates/bacula-sd.conf.erb @@ -34,7 +34,7 @@ Storage { TLS Enable = yes TLS Require = yes TLS Verify Peer = yes - TLS CA Certificate File = "<%= @bacula_ca_path %>" + TLS CA Certificate File = "<%= @bacula_ssl_ca_path %>" # This is a server certificate, used for incoming connections. TLS Certificate = "<%= @bacula_ssl_server_cert %>" TLS Key = "<%= @bacula_ssl_server_key %>" diff --git a/modules/bacula/templates/bconsole.conf.erb b/modules/bacula/templates/bconsole.conf.erb index de675d4db..5e89a1612 100644 --- a/modules/bacula/templates/bconsole.conf.erb +++ b/modules/bacula/templates/bconsole.conf.erb @@ -15,7 +15,7 @@ Director { TLS Enable = yes TLS Require = yes - TLS CA Certificate File = "<%= @bacula_ca_path %>" + TLS CA Certificate File = "<%= @bacula_ssl_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 %>" diff --git a/modules/bacula/templates/client/fd-per-director.conf.erb b/modules/bacula/templates/client/fd-per-director.conf.erb index 19c62fc6f..45eedf376 100644 --- a/modules/bacula/templates/client/fd-per-director.conf.erb +++ b/modules/bacula/templates/client/fd-per-director.conf.erb @@ -13,7 +13,7 @@ Director { TLS Require = yes TLS Verify Peer = yes TLS Allowed CN = "clientcerts/<%= @director_address %>" - TLS CA Certificate File = "<%= scope['bacula::bacula_ca_path'] %>" + TLS CA Certificate File = "<%= scope['bacula::bacula_ssl_ca_path'] %>" # This is a server certificate, used for incoming director connections. TLS Certificate = "<%= scope['bacula::bacula_ssl_server_cert'] %>" TLS Key = "<%= scope['bacula::bacula_ssl_server_key'] %>" diff --git a/modules/bacula/templates/director/dir-per-client-from-storage.erb b/modules/bacula/templates/director/dir-per-client-from-storage.erb index 5f67f7166..0336cb004 100644 --- a/modules/bacula/templates/director/dir-per-client-from-storage.erb +++ b/modules/bacula/templates/director/dir-per-client-from-storage.erb @@ -19,7 +19,7 @@ Storage { TLS Enable = yes TLS Require = yes - TLS CA Certificate File = "<%= @bacula_ca_path %>" + TLS CA Certificate File = "<%= @bacula_ssl_ca_path %>" # This is a client certificate, used by the director to connect to the storage daemon TLS Certificate = "<%= @bacula_ssl_client_cert %>" TLS Key = "<%= @bacula_ssl_client_key %>" diff --git a/modules/bacula/templates/director/dir-per-client.erb b/modules/bacula/templates/director/dir-per-client.erb index 15a77c282..4e4903c69 100644 --- a/modules/bacula/templates/director/dir-per-client.erb +++ b/modules/bacula/templates/director/dir-per-client.erb @@ -34,7 +34,7 @@ Client { TLS Enable = yes TLS Require = yes - TLS CA Certificate File = "<%= @bacula_ca_path %>" + TLS CA Certificate File = "<%= @bacula_ssl_ca_path %>" # This is a client certificate, used by the director to connect to the client's file daemon TLS Certificate = "<%= @bacula_ssl_client_cert %>" TLS Key = "<%= @bacula_ssl_client_key %>" diff --git a/modules/bacula/templates/storage/sd-per-director.conf.erb b/modules/bacula/templates/storage/sd-per-director.conf.erb index 29a29b981..4514cbd52 100644 --- a/modules/bacula/templates/storage/sd-per-director.conf.erb +++ b/modules/bacula/templates/storage/sd-per-director.conf.erb @@ -10,7 +10,7 @@ Director { TLS Require = yes TLS Verify Peer = yes TLS Allowed CN = "clientcerts/<%= @director_address %>" - TLS CA Certificate File = "<%= scope['bacula::bacula_ca_path'] %>" + TLS CA Certificate File = "<%= scope['bacula::bacula_ssl_ca_path'] %>" # This is a server certificate, used for incoming director connections. TLS Certificate = "<%= scope['bacula::bacula_ssl_server_cert'] %>" TLS Key = "<%= scope['bacula::bacula_ssl_server_key'] %>" -- 2.20.1