Skip to content

Commit 4765129

Browse files
committed
Merge if/else branch into a single resource declaration
This always defined the same file, just with a different source. That source is either the provided server_ca_cert or the default CA.
1 parent 2daeb00 commit 4765129

File tree

1 file changed

+6
-16
lines changed

1 file changed

+6
-16
lines changed

manifests/ca.pp

Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -47,22 +47,12 @@
4747
}
4848

4949
if $generate {
50-
if $certs::server_ca_cert {
51-
file { $server_ca_path:
52-
ensure => file,
53-
source => $certs::server_ca_cert,
54-
owner => 'root',
55-
group => 'root',
56-
mode => '0644',
57-
}
58-
} else {
59-
file { $server_ca_path:
60-
ensure => file,
61-
source => $default_ca_path,
62-
owner => 'root',
63-
group => 'root',
64-
mode => '0644',
65-
}
50+
file { $server_ca_path:
51+
ensure => file,
52+
source => pick($certs::server_ca_cert, $default_ca_path),
53+
owner => 'root',
54+
group => 'root',
55+
mode => '0644',
6656
}
6757

6858
file { "${certs::ssl_build_dir}/KATELLO-TRUSTED-SSL-CERT":

0 commit comments

Comments
 (0)