Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes #10670 - preffer the katello-default-ca.pem as the client ca cert #23

Merged
merged 1 commit into from Jun 2, 2015

Conversation

iNecas
Copy link
Member

@iNecas iNecas commented Jun 1, 2015

Followed by candlepin-local.pem for backward compatibility and the
repo_ca_cert as fallback.

Requires theforeman/puppet-certs#62 to work properly.

Followed by candlepin-local.pem for backward compatibility and the repo_ca_cert as fallback.
@jlsherrill
Copy link
Member

ACK

iNecas added a commit that referenced this pull request Jun 2, 2015
Fixes #10670 - preffer the katello-default-ca.pem as the client ca cert
@iNecas iNecas merged commit eee0d07 into Katello:master Jun 2, 2015
# legacy installer was putting this file. If none of them is present, there is still
# a chance the rhsm_conf['rhsm']['repo_ca_cert'] is serving as the CA for issuing
# the client certs
ca_candidates = [ca_cert_dir + 'katello-default-ca.pem', ca_cert_dir + 'candlepin-local.pem', rhsm_conf['rhsm']['repo_ca_cert'] % rhsm_conf['rhsm']]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Using os.path.join() instead of (+) would be safer. The value of ca_cert_dir may not end with a '/'.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've opened new PR for this #24

zjhuntin pushed a commit to zjhuntin/katello-agent that referenced this pull request Jan 23, 2017
fixes #11261 - wait a little after starting httpd
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
3 participants