From a71804a13b020f81a5191b2ece87e0500f6c23ec Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Tue, 12 Aug 2025 11:47:39 -0400 Subject: [PATCH] Fix suse/ubuntu paths for apache config --- confluent_server/confluent/certutil.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/confluent_server/confluent/certutil.py b/confluent_server/confluent/certutil.py index a60a585e..46ae2f69 100644 --- a/confluent_server/confluent/certutil.py +++ b/confluent_server/confluent/certutil.py @@ -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):