Skip to content

Commit

Permalink
Drop absent file declarations
Browse files Browse the repository at this point in the history
  • Loading branch information
ehelms committed May 6, 2024
1 parent b74f62c commit 3f81ab5
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 44 deletions.
10 changes: 0 additions & 10 deletions manifests/ca.pp
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,6 @@
) {
$server_ca_path = "${certs::ssl_build_dir}/${server_ca_name}.crt"

file { "${certs::pki_dir}/private/${default_ca_name}.pwd":
ensure => absent,
}

file { $ca_key_password_file:
ensure => file,
content => $ca_key_password,
Expand Down Expand Up @@ -76,12 +72,6 @@
}

if $deploy {
# Ensure CA key deployed to /etc/pki/katello/private no longer exists
# The CA key is not used by anything from this directory and does not need to be deployed
file { $ca_key:
ensure => absent,
}

file { $certs::katello_default_ca_cert:
ensure => file,
source => "${certs::ssl_build_dir}/${default_ca_name}.crt",
Expand Down
34 changes: 0 additions & 34 deletions manifests/candlepin.pp
Original file line number Diff line number Diff line change
Expand Up @@ -28,24 +28,6 @@
$java_client_cert_name = 'java-client'
$artemis_alias = 'artemis-client'
$artemis_client_dn = $certs::foreman::client_dn

cert { $java_client_cert_name:
ensure => absent,
hostname => $hostname,
cname => $cname,
country => $country,
state => $state,
city => $city,
org => 'candlepin',
org_unit => $org_unit,
expiration => $expiration,
ca => $certs::default_ca,
generate => $generate,
regenerate => $regenerate,
password_file => $ca_key_password_file,
build_dir => $certs::ssl_build_dir,
}

$tomcat_cert_name = "${hostname}-tomcat"

cert { $tomcat_cert_name:
Expand Down Expand Up @@ -89,22 +71,6 @@
key_decrypt => true,
}

file { "${pki_dir}/private/katello-tomcat.key":
ensure => absent,
}

file { "${pki_dir}/certs/katello-tomcat.crt":
ensure => absent,
}

file { "${pki_dir}/private/${java_client_cert_name}.key":
ensure => absent,
}

file { "${pki_dir}/certs/${java_client_cert_name}.crt":
ensure => absent,
}

file { $keystore_password_path:
ensure => file,
content => $keystore_password,
Expand Down

0 comments on commit 3f81ab5

Please sign in to comment.