Rely on the generated CA certificate location when deploying the CA cert #492
+46
−66
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ehelms
force-pushed
the
use-ca-from-ssl-build
branch
from
06d407a to
a49f416
Compare
ekohl
reviewed
Mar 4, 2025
|
See #488 (comment) about the failure |
ehelms
force-pushed
the
use-ca-from-ssl-build
branch
2 times, most recently
from
e81090e to
414176d
Compare
ekohl
reviewed
Mar 5, 2025
manifests/foreman.pp
Outdated
| @@ -15,7 +15,7 @@ | |||
| String $org_unit = 'PUPPET', | |||
| String $expiration = $certs::expiration, | |||
| Stdlib::Absolutepath $ca_key_password_file = $certs::ca_key_password_file, | |||
| Stdlib::Absolutepath $server_ca = $certs::katello_server_ca_cert, | |||
| Stdlib::Absolutepath $server_ca = $certs::ca::server_ca_path, | |||
There was a problem hiding this comment.
One issue is that you can't be sure this is set. We can with $certs::* because this class inherits from certs.
I'd be tempted to define server_ca_path (and default_ca_path in $certs and then simply use $certs::server_ca_path in certs::ca.
ehelms
force-pushed
the
use-ca-from-ssl-build
branch
from
414176d to
353bd52
Compare
Signed-off-by: Eric D. Helms <[email protected]>
ehelms
force-pushed
the
use-ca-from-ssl-build
branch
from
353bd52 to
cd1b917
Compare
ehelms
commented
Mar 5, 2025
| mode => '0440', | ||
| require => File[$server_ca], | ||
| ensure => file, | ||
| source => pick($server_ca, $certs::ca::server_ca_path), |
There was a problem hiding this comment.
@ekohl Thoughts on this approach? With the undef optional parameter in the class?
I could just drop the class parameter all together - I don't think it really gets any value or will be used at this point. The server_ca_path is tied to the certs::ca class as that is what generates / defines it.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The
/etc/pki/katellolocation for the CA certificate is needed by the Apache service and not as a general purpose location for the CA certificate. Other services that have certificates can rely on the CA from thessl-builddirectory when deploying rather than an intermediate step that has it deployed to the Apache needed location. This should give a bit better separation of concerns.Requires - #487