diff options
author | Endi Sukma Dewata <edewata@redhat.com> | 2012-11-28 13:12:24 -0500 |
---|---|---|
committer | Endi Sukma Dewata <edewata@redhat.com> | 2012-11-28 15:33:47 -0500 |
commit | b769780f64968c6b8d1dfec6782f73c18a82692f (patch) | |
tree | fa5758623d4c5f051f78662eb40970063cb1b18c /base/deploy/src/scriptlets/pkiconfig.py | |
parent | 310a30f230eae7fd34d8a41e54ee3125ffb91046 (diff) | |
download | pki-b769780f64968c6b8d1dfec6782f73c18a82692f.tar.gz pki-b769780f64968c6b8d1dfec6782f73c18a82692f.tar.xz pki-b769780f64968c6b8d1dfec6782f73c18a82692f.zip |
Simplified the configuration file using defaults.
Previously to create a subsystem the admin would have to copy the
entire default deployment configuration, which contains many
parameters, and then customize it. Now the deployment code has been
changed such that the default config file will be used to provide
the default values, so the admin will only need to provide the
non-default parameters, thus reducing the size of the file.
Sample configuration files are provided in /usr/share/pki/
deployment/config.
Ticket #399
Diffstat (limited to 'base/deploy/src/scriptlets/pkiconfig.py')
-rw-r--r-- | base/deploy/src/scriptlets/pkiconfig.py | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/base/deploy/src/scriptlets/pkiconfig.py b/base/deploy/src/scriptlets/pkiconfig.py index 7e426b0f9..ab3cebb67 100644 --- a/base/deploy/src/scriptlets/pkiconfig.py +++ b/base/deploy/src/scriptlets/pkiconfig.py @@ -99,9 +99,14 @@ PKI_DEPLOYMENT_DEFAULT_APACHE_SERVICE_NAME = "apache" 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_DEFAULT_CONFIGURATION_FILE = "pkideployment.cfg" + +PKI_DEPLOYMENT_CONFIGURATION_DIR =\ + "/usr/share/pki/deployment/config" +PKI_DEPLOYMENT_CONFIGURATION_FILE = "deployment.cfg" +PKI_DEPLOYMENT_DEFAULT_CONFIGURATION_FILE =\ + PKI_DEPLOYMENT_CONFIGURATION_DIR + "/" + PKI_DEPLOYMENT_CONFIGURATION_FILE PKI_DEPLOYMENT_SLOTS_CONFIGURATION_FILE =\ - "/usr/share/pki/deployment/config/pkislots.cfg" + PKI_DEPLOYMENT_CONFIGURATION_DIR + "/pkislots.cfg" # subtypes of PKI subsystems PKI_DEPLOYMENT_CLONED_PKI_SUBSYSTEM = "Cloned" @@ -151,7 +156,7 @@ def str2bool(string): # and 'wait_to_attach_an_external_java_debugger(master)' functions, # change 'pki_enable_java_debugger=False' to # 'pki_enable_java_debugger=True' in the appropriate -# 'pkideployment.cfg' configuration file. +# deployment configuration file. def prepare_for_an_external_java_debugger(instance): print print PKI_DEPLOYMENT_INTERRUPT_BANNER |