mirror of
https://github.com/valitydev/salt.git
synced 2024-11-07 17:09:03 +00:00
Merge pull request #29204 from lorengordon/fix-29202
Use os.path.join to return full path to ca bundle
This commit is contained in:
commit
df7b35a86b
@ -467,8 +467,9 @@ def get_ca_bundle(opts=None):
|
||||
# Check Salt first
|
||||
for salt_root in file_roots.get('base', []):
|
||||
for path in ('cacert.pem', 'ca-bundle.crt'):
|
||||
if os.path.exists(path):
|
||||
return path
|
||||
cert_path = os.path.join(salt_root, path)
|
||||
if os.path.exists(cert_path):
|
||||
return cert_path
|
||||
|
||||
locations = (
|
||||
# Debian has paths that often exist on other distros
|
||||
|
Loading…
Reference in New Issue
Block a user