From 003f92dbfe597783b53d6c0532badfb039e9d270 Mon Sep 17 00:00:00 2001 From: "Endi S. Dewata" Date: Thu, 13 Jul 2023 18:13:55 -0500 Subject: [PATCH] Remove non-configurable pki_path param --- base/server/etc/default.cfg | 3 +-- base/server/python/pki/server/deployment/__init__.py | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/base/server/etc/default.cfg b/base/server/etc/default.cfg index 58865404fdc..9f4eec08965 100644 --- a/base/server/etc/default.cfg +++ b/base/server/etc/default.cfg @@ -210,8 +210,7 @@ pki_client_pkcs12_password_conf=%(pki_client_subsystem_dir)s/pkcs12_password.con pki_client_admin_cert=%(pki_client_dir)s/%(pki_subsystem_type)s_admin.cert pki_source_subsystem_path=/usr/share/pki/%(pki_subsystem_type)s -pki_path=/var/lib/pki -pki_instance_path=%(pki_path)s/%(pki_instance_name)s +pki_instance_path=/var/lib/pki/%(pki_instance_name)s pki_instance_log_path=/var/log/pki/%(pki_instance_name)s pki_instance_configuration_path=/etc/pki/%(pki_instance_name)s diff --git a/base/server/python/pki/server/deployment/__init__.py b/base/server/python/pki/server/deployment/__init__.py index 5d201468755..bc5cb1be7d0 100644 --- a/base/server/python/pki/server/deployment/__init__.py +++ b/base/server/python/pki/server/deployment/__init__.py @@ -413,9 +413,9 @@ def pki_instance_subsystems(self): # SHOULD represent PKI instances, look for all possible # PKI instances within the top-level PKI infrastructure - for instance in os.listdir(self.mdict['pki_path']): + for instance in os.listdir(pki.server.PKIServer.BASE_DIR): - instance_dir = os.path.join(self.mdict['pki_path'], instance) + instance_dir = os.path.join(pki.server.PKIServer.BASE_DIR, instance) if not os.path.isdir(instance_dir) or os.path.islink(instance_dir): continue