Skip to content

Commit 56f8921

Browse files
committed
Introduce $default_ca_path variable in certs::ca
This is reused a few times and makes it easier to follow what's related.
1 parent ec68db9 commit 56f8921

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

manifests/ca.pp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
String $ca_key_password = $certs::ca_key_password,
2222
Stdlib::Absolutepath $ca_key_password_file = $certs::ca_key_password_file,
2323
) {
24+
$default_ca_path = "${certs::ssl_build_dir}/${default_ca_name}.crt"
2425
$server_ca_path = "${certs::ssl_build_dir}/${server_ca_name}.crt"
2526

2627
file { $ca_key_password_file:
@@ -56,7 +57,7 @@
5657
} else {
5758
file { $server_ca_path:
5859
ensure => file,
59-
source => "${certs::ssl_build_dir}/${default_ca_name}.crt",
60+
source => $default_ca_path,
6061
owner => 'root',
6162
group => 'root',
6263
mode => '0644',
@@ -74,7 +75,7 @@
7475
if $deploy {
7576
file { $certs::katello_default_ca_cert:
7677
ensure => file,
77-
source => "${certs::ssl_build_dir}/${default_ca_name}.crt",
78+
source => $default_ca_path,
7879
owner => 'root',
7980
group => 'root',
8081
mode => '0644',

0 commit comments

Comments
 (0)