From fbfdeeaaa75e93ec512c045140a5839dad3e381b Mon Sep 17 00:00:00 2001 From: Endi Sukma Dewata Date: Tue, 4 Dec 2012 07:19:43 -0500 Subject: Archiving default deployment configuration. The default deployment configuration file has been moved to /etc/pki/default.cfg to make it more accessible. The pkispawn has been modified to archieve the default deployment configuration along with the user-provided configuration in the registry. The pkidestroy has been modified to use both archived configuration files to ensure proper removal. Ticket #399 --- base/deploy/src/scriptlets/infrastructure_layout.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'base/deploy/src/scriptlets/infrastructure_layout.py') diff --git a/base/deploy/src/scriptlets/infrastructure_layout.py b/base/deploy/src/scriptlets/infrastructure_layout.py index 8eed598cd..947fbcdfe 100644 --- a/base/deploy/src/scriptlets/infrastructure_layout.py +++ b/base/deploy/src/scriptlets/infrastructure_layout.py @@ -56,8 +56,10 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): util.directory.create(master['pki_instance_type_registry_path']) util.directory.create(master['pki_instance_registry_path']) util.directory.create(master['pki_subsystem_registry_path']) - util.file.copy(master['pki_deployment_cfg'], - master['pki_deployment_cfg_replica']) + util.file.copy(master['pki_default_deployment_cfg'], + master['pki_default_deployment_cfg_replica']) + util.file.copy(master['pki_user_deployment_cfg'], + master['pki_user_deployment_cfg_replica']) # establish top-level infrastructure, instance, and subsystem # base directories and create the "registry" symbolic link that # the "pkidestroy" executable relies upon -- cgit