diff options
| author | Endi Sukma Dewata <edewata@redhat.com> | 2012-12-04 07:19:43 -0500 |
|---|---|---|
| committer | Endi Sukma Dewata <edewata@redhat.com> | 2012-12-04 12:15:50 -0500 |
| commit | 20b8b11f2e6cf0395f4aecc42fa1873877ed9547 (patch) | |
| tree | 1bc4fca9e6ad851b98175dee22fc4abdc2f2bd10 /base/deploy/src/scriptlets/infrastructure_layout.py | |
| parent | b2e265466c6b183b707f9a1a8495e31cb121ddfd (diff) | |
| download | pki-20b8b11f2e6cf0395f4aecc42fa1873877ed9547.tar.gz pki-20b8b11f2e6cf0395f4aecc42fa1873877ed9547.tar.xz pki-20b8b11f2e6cf0395f4aecc42fa1873877ed9547.zip | |
Archiving default deployment configuration.ticket-399-8
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
Diffstat (limited to 'base/deploy/src/scriptlets/infrastructure_layout.py')
| -rw-r--r-- | base/deploy/src/scriptlets/infrastructure_layout.py | 6 |
1 files changed, 4 insertions, 2 deletions
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 |