s/bacula_ca_path/bacula_ssl_ca_path/

diff --git a/modules/bacula/manifests/director/client.pp b/modules/bacula/manifests/director/client.pp
index cbfd139..fecbe41 100644 (file)
--- 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 b6c8eec..ac77de9 100644 (file)
--- 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 cff4087..eb98084 100644 (file)
--- 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 b1cdedd..c836c72 100644 (file)
--- 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 ae8912d..2f9acda 100644 (file)
--- 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 12b45aa..76bda9e 100644 (file)
--- 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 de675d4..5e89a16 100644 (file)
--- 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 19c62fc..45eedf3 100644 (file)
--- 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 5f67f71..0336cb0 100644 (file)
--- 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 15a77c2..4e4903c 100644 (file)
--- 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 29a29b9..4514cbd 100644 (file)
--- 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'] %>"