From eb581e13b95bb9e803051e5d8741853ca3929b37 Mon Sep 17 00:00:00 2001 From: "Endi S. Dewata" Date: Tue, 18 Jul 2023 12:42:01 -0500 Subject: [PATCH] Replace pki_instance_path param with PKIServer.base_dir --- base/server/python/pki/server/deployment/__init__.py | 4 ++-- base/server/python/pki/server/deployment/pkihelper.py | 10 +++++----- .../server/deployment/scriptlets/instance_layout.py | 6 +++--- base/server/python/pki/server/pkispawn.py | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/base/server/python/pki/server/deployment/__init__.py b/base/server/python/pki/server/deployment/__init__.py index 86793fad8e4..a2590da9f4e 100644 --- a/base/server/python/pki/server/deployment/__init__.py +++ b/base/server/python/pki/server/deployment/__init__.py @@ -2566,8 +2566,8 @@ def create_admin_cert(self, subsystem, csr): request.systemCert.adjustValidity = False profile_filename = os.path.join( - self.mdict['pki_instance_path'], - 'ca/profiles/ca/%s.cfg' % self.mdict['pki_admin_profile_id']) + subsystem.conf_dir, + 'profiles/ca/%s.cfg' % self.mdict['pki_admin_profile_id']) logger.info('Loading %s', profile_filename) profile = {} diff --git a/base/server/python/pki/server/deployment/pkihelper.py b/base/server/python/pki/server/deployment/pkihelper.py index a4dd7127d1b..7e1e73f470a 100644 --- a/base/server/python/pki/server/deployment/pkihelper.py +++ b/base/server/python/pki/server/deployment/pkihelper.py @@ -290,17 +290,17 @@ def collision_detection(self, instance): instance.base_dir, self.mdict['pki_subsystem_type']) - if os.path.exists(self.mdict['pki_instance_path']): + if os.path.exists(instance.base_dir): if os.path.exists(subsystem_path): # Top-Level PKI base path collision logger.error( log.PKIHELPER_NAMESPACE_COLLISION_2, self.mdict['pki_instance_name'], - self.mdict['pki_instance_path']) + instance.base_dir) raise Exception( log.PKIHELPER_NAMESPACE_COLLISION_2 % ( self.mdict['pki_instance_name'], - self.mdict['pki_instance_path'])) + instance.base_dir)) else: if os.path.exists(instance.service_conf): # Top-Level "/etc/sysconfig" path collision @@ -399,11 +399,11 @@ def collision_detection(self, instance): logger.error( log.PKIHELPER_NAMESPACE_RESERVED_NAME_2, self.mdict['pki_instance_name'], - self.mdict['pki_instance_path']) + instance.base_dir) raise Exception( log.PKIHELPER_NAMESPACE_RESERVED_NAME_2 % ( self.mdict['pki_instance_name'], - self.mdict['pki_instance_path'])) + instance.base_dir)) # No need to check for reserved name under Top-Level PKI log path if self.mdict['pki_instance_name'] in \ config.PKI_CONFIGURATION_RESERVED_NAMES: diff --git a/base/server/python/pki/server/deployment/scriptlets/instance_layout.py b/base/server/python/pki/server/deployment/scriptlets/instance_layout.py index 44fbeec84e2..fc9100f17fc 100644 --- a/base/server/python/pki/server/deployment/scriptlets/instance_layout.py +++ b/base/server/python/pki/server/deployment/scriptlets/instance_layout.py @@ -49,7 +49,7 @@ def spawn(self, deployer): instance.load() # Create /var/lib/pki/ - instance.makedirs(deployer.mdict['pki_instance_path'], exist_ok=True) + instance.makedirs(instance.base_dir, exist_ok=True) instance_conf_path = deployer.mdict['pki_instance_configuration_path'] @@ -305,8 +305,8 @@ def destroy(self, deployer): if config.str2bool(deployer.mdict['pki_registry_enable']): instance.remove_registry(force=deployer.force) - logger.info('Removing %s', deployer.mdict['pki_instance_path']) - pki.util.rmtree(path=deployer.mdict['pki_instance_path'], + logger.info('Removing %s', instance.base_dir) + pki.util.rmtree(path=instance.base_dir, force=deployer.force) if deployer.remove_logs: diff --git a/base/server/python/pki/server/pkispawn.py b/base/server/python/pki/server/pkispawn.py index 39a3ab9c908..96609c5bdff 100644 --- a/base/server/python/pki/server/pkispawn.py +++ b/base/server/python/pki/server/pkispawn.py @@ -563,7 +563,7 @@ def main(argv): sys.exit(0) print("Installing " + deployer.subsystem_name + " into " + - parser.mdict['pki_instance_path'] + ".") + instance.base_dir + ".") # Process the various "scriptlets" to create the specified PKI subsystem. pki_subsystem_scriptlets = parser.mdict['spawn_scriplets'].split()