saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Use os.path.join to return full path to ca bundle

Browse source 
Fixes #29202
This commit is contained in:
Loren Gordon 2015-11-25 13:34:44 -05:00
parent a26c10a811
commit b1dae5e6fe
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
salt/utils/http.py
View file

@ -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