xCAT/confluent
2
0
Fork 0
mirror of https://github.com/xcat2/confluent.git synced 2026-01-11 10:32:31 +00:00
Code Issues Projects Releases Wiki Activity

Fix suse/ubuntu paths for apache config

Browse Source
This commit is contained in:
Jarrod Johnson
2025-08-12 11:47:39 -04:00
parent dbda4f45a1
commit a71804a13b
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
confluent_server/confluent/certutil.py
View File

@@ -116,9 +116,9 @@ def get_certificate_paths():
kploc = check_apache_config(os.path.join(currpath,
fname))
if keypath and kploc[0] and keypath != kploc[0]:
return None, None # Ambiguous...
return {'error': 'Ambiguous...'}
if kploc[0]:
keypath, certpath = kploc
keypath, certpath, chainpath = kploc
if os.path.exists('/etc/nginx'): # nginx way
for currpath, _, files in os.walk('/etc/nginx'):
if ngkeypath:
@@ -143,7 +143,6 @@ def get_certificate_paths():
tlsmateriallocation.setdefault('bundles', []).append(ngbundlepath)
return tlsmateriallocation
def assure_tls_ca():
keyout, certout = ('/etc/confluent/tls/cakey.pem', '/etc/confluent/tls/cacert.pem')
if not os.path.exists(certout):