From bbeedaf03e47f1c9afd6c0175c77fd5efe503c3a Mon Sep 17 00:00:00 2001 From: Ewoud Kohl van Wijngaarden Date: Thu, 12 Sep 2024 17:49:06 +0200 Subject: [PATCH] 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. --- manifests/ca.pp | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/manifests/ca.pp b/manifests/ca.pp index e86423ce..c0724112 100644 --- a/manifests/ca.pp +++ b/manifests/ca.pp @@ -47,22 +47,12 @@ } if $generate { - if $certs::server_ca_cert { - file { $server_ca_path: - ensure => file, - source => $certs::server_ca_cert, - owner => 'root', - group => 'root', - mode => '0644', - } - } else { - file { $server_ca_path: - ensure => file, - source => $default_ca_path, - owner => 'root', - group => 'root', - mode => '0644', - } + file { $server_ca_path: + ensure => file, + source => pick($certs::server_ca_cert, $default_ca_path), + owner => 'root', + group => 'root', + mode => '0644', } file { "${certs::ssl_build_dir}/KATELLO-TRUSTED-SSL-CERT":