diff options
| author | Endi S. Dewata <edewata@redhat.com> | 2016-05-07 00:07:53 +0200 |
|---|---|---|
| committer | Endi S. Dewata <edewata@redhat.com> | 2016-05-09 21:42:39 +0200 |
| commit | fe1f36dd601f5d8956cf6e1d9b1855b5ea755596 (patch) | |
| tree | d2e14bf09e318940c93f2d68a6657f73b5a4dc0c /base/server/python | |
| parent | 90143ffad6a20493219c67b55c57724afb4edfde (diff) | |
| download | pki-fe1f36dd601f5d8956cf6e1d9b1855b5ea755596.tar.gz pki-fe1f36dd601f5d8956cf6e1d9b1855b5ea755596.tar.xz pki-fe1f36dd601f5d8956cf6e1d9b1855b5ea755596.zip | |
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
Diffstat (limited to 'base/server/python')
| -rw-r--r-- | base/server/python/pki/server/deployment/scriptlets/slot_substitution.py | 3 | ||||
| -rw-r--r-- | base/server/python/pki/server/deployment/scriptlets/subsystem_layout.py | 10 |
2 files changed, 9 insertions, 4 deletions
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 @@ -39,9 +39,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'], overwrite_flag=True) 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/<instance>/<subsystem>/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/<instance>/<subsystem>/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 |