From fe1f36dd601f5d8956cf6e1d9b1855b5ea755596 Mon Sep 17 00:00:00 2001 From: "Endi S. Dewata" Date: Sat, 7 May 2016 00:07:53 +0200 Subject: Added deployment parameters for number ranges. New deployment parameters have been added to customize the serial number range, request number range, and replica number range in CS.cfg during installation. The code that generates the CS.cfg has been moved closer to the code that generates the subsystem configuration folder. https://fedorahosted.org/pki/ticket/2278 --- .../pki/server/deployment/scriptlets/slot_substitution.py | 3 --- .../pki/server/deployment/scriptlets/subsystem_layout.py | 10 +++++++++- 2 files changed, 9 insertions(+), 4 deletions(-) (limited to 'base/server/python') diff --git a/base/server/python/pki/server/deployment/scriptlets/slot_substitution.py b/base/server/python/pki/server/deployment/scriptlets/slot_substitution.py index 5a56f6cbb..1e85e44da 100644 --- a/base/server/python/pki/server/deployment/scriptlets/slot_substitution.py +++ b/base/server/python/pki/server/deployment/scriptlets/slot_substitution.py @@ -38,9 +38,6 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): config.pki_log.info(log.SLOT_ASSIGNMENT_SPAWN_1, __name__, extra=config.PKI_INDENTATION_LEVEL_1) - deployer.file.copy_with_slot_substitution( - deployer.mdict['pki_source_cs_cfg'], - deployer.mdict['pki_target_cs_cfg']) deployer.file.copy_with_slot_substitution( deployer.mdict['pki_source_registry'], deployer.mdict['pki_target_registry'], diff --git a/base/server/python/pki/server/deployment/scriptlets/subsystem_layout.py b/base/server/python/pki/server/deployment/scriptlets/subsystem_layout.py index 2b2246a72..6cc08cf96 100644 --- a/base/server/python/pki/server/deployment/scriptlets/subsystem_layout.py +++ b/base/server/python/pki/server/deployment/scriptlets/subsystem_layout.py @@ -46,12 +46,20 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): config.PKI_SIGNED_AUDIT_SUBSYSTEMS: deployer.directory.create( deployer.mdict['pki_subsystem_signed_audit_log_path']) - # establish instance-based subsystem configuration + + # create /var/lib/pki///conf deployer.directory.create( deployer.mdict['pki_subsystem_configuration_path']) + # deployer.directory.copy( # deployer.mdict['pki_source_conf_path'], # deployer.mdict['pki_subsystem_configuration_path']) + + # create /var/lib/pki///conf/CS.cfg + deployer.file.copy_with_slot_substitution( + deployer.mdict['pki_source_cs_cfg'], + deployer.mdict['pki_target_cs_cfg']) + # establish instance-based Tomcat specific subsystems # establish instance-based Tomcat PKI subsystem base -- cgit