diff options
| author | Endi Sukma Dewata <edewata@redhat.com> | 2012-12-04 07:19:43 -0500 |
|---|---|---|
| committer | Ade Lee <alee@redhat.com> | 2012-12-04 15:50:55 -0500 |
| commit | 81bb209d0a3227f544b7b8e4ec3fc0631c8f3c47 (patch) | |
| tree | 0d72fda5309de4cd1c23319995f0214d7c361e39 /base/deploy/src/scriptlets/finalization.py | |
| parent | cb3d05b1225137f9a54952045dace4fc1f9a99b8 (diff) | |
| download | pki-81bb209d0a3227f544b7b8e4ec3fc0631c8f3c47.tar.gz pki-81bb209d0a3227f544b7b8e4ec3fc0631c8f3c47.tar.xz pki-81bb209d0a3227f544b7b8e4ec3fc0631c8f3c47.zip | |
Archiving default deployment configuration.
The default deployment configuration has been renamed and moved to
/etc/pki/default.cfg to make it more accessible to users. The pkispawn
has been modified to archive the default deployment configuration
along with the user-provided configuration in the registry. The
pkidestroy will now use both archived configuration files to ensure
proper removal of the subsystem.
Ticket #399
Diffstat (limited to 'base/deploy/src/scriptlets/finalization.py')
| -rw-r--r-- | base/deploy/src/scriptlets/finalization.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/base/deploy/src/scriptlets/finalization.py b/base/deploy/src/scriptlets/finalization.py index 55a007bca..ec8fa6eff 100644 --- a/base/deploy/src/scriptlets/finalization.py +++ b/base/deploy/src/scriptlets/finalization.py @@ -41,8 +41,10 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): extra=config.PKI_INDENTATION_LEVEL_1) # For debugging/auditing purposes, save a timestamped copy of # this configuration file in the subsystem archive - util.file.copy(master['pki_deployment_cfg_replica'], - master['pki_deployment_cfg_spawn_archive']) + util.file.copy(master['pki_default_deployment_cfg_replica'], + master['pki_default_deployment_cfg_spawn_archive']) + util.file.copy(master['pki_user_deployment_cfg_replica'], + master['pki_user_deployment_cfg_spawn_archive']) # Save a copy of the installation manifest file config.pki_log.info(log.PKI_MANIFEST_MESSAGE_1, master['pki_manifest'], extra=config.PKI_INDENTATION_LEVEL_2) |