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 13:15:18 -0500 |
| commit | 952300522ab5aaa9343c96dde7d785727cadfd95 (patch) | |
| tree | c312cdaf4443ba70d99d99a66de856766abb315e /base/deploy/src/scriptlets/pkiconfig.py | |
| parent | a3f7d585fed02fb8b0adaf46228f23bf1275c596 (diff) | |
| download | pki-ticket-399-9.tar.gz pki-ticket-399-9.tar.xz pki-ticket-399-9.zip | |
Archiving default deployment configuration.ticket-399-9
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 archieve 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.
Ticket #399
Diffstat (limited to 'base/deploy/src/scriptlets/pkiconfig.py')
| -rw-r--r-- | base/deploy/src/scriptlets/pkiconfig.py | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/base/deploy/src/scriptlets/pkiconfig.py b/base/deploy/src/scriptlets/pkiconfig.py index ec6c5ea38..4bbf92e91 100644 --- a/base/deploy/src/scriptlets/pkiconfig.py +++ b/base/deploy/src/scriptlets/pkiconfig.py @@ -100,13 +100,13 @@ PKI_DEPLOYMENT_DEFAULT_TOMCAT_SERVICE_NAME = "tomcat" PKI_DEPLOYMENT_DEFAULT_APACHE_INSTANCE_NAME = "pki-apache" PKI_DEPLOYMENT_DEFAULT_TOMCAT_INSTANCE_NAME = "pki-tomcat" -PKI_DEPLOYMENT_CONFIGURATION_DIR =\ - "/usr/share/pki/deployment/config" -PKI_DEPLOYMENT_CONFIGURATION_FILE = "deployment.cfg" +DEFAULT_DEPLOYMENT_CONFIGURATION = "default.cfg" +USER_DEPLOYMENT_CONFIGURATION = "deployment.cfg" + PKI_DEPLOYMENT_DEFAULT_CONFIGURATION_FILE =\ - PKI_DEPLOYMENT_CONFIGURATION_DIR + "/" + PKI_DEPLOYMENT_CONFIGURATION_FILE + PKI_DEPLOYMENT_CONFIGURATION_ROOT + "/" + DEFAULT_DEPLOYMENT_CONFIGURATION PKI_DEPLOYMENT_SLOTS_CONFIGURATION_FILE =\ - PKI_DEPLOYMENT_CONFIGURATION_DIR + "/pkislots.cfg" + PKI_DEPLOYMENT_SOURCE_ROOT + "/deployment/config/pkislots.cfg" # subtypes of PKI subsystems PKI_DEPLOYMENT_CLONED_PKI_SUBSYSTEM = "Cloned" @@ -140,7 +140,8 @@ pki_deployment_executable = None # PKI Deployment "Mandatory" Command-Line Variables pki_subsystem = None # 'pkispawn' ONLY -pkideployment_cfg = None +default_deployment_cfg = None +user_deployment_cfg = None # 'pkidestroy' ONLY pki_deployed_instance_name = None |