diff options
| author | Endi S. Dewata <edewata@redhat.com> | 2016-03-25 03:12:27 +0100 |
|---|---|---|
| committer | Endi S. Dewata <edewata@redhat.com> | 2016-04-15 20:03:30 +0200 |
| commit | 08f032de4090467ac4096f970609e19834b997ac (patch) | |
| tree | b41d3508f85ff46281b0b5c3793d6d932c8e9942 /base/server/python/pki/server/deployment/pkihelper.py | |
| parent | e3449617d90f5f73afdb568cc2f43769e5ea760b (diff) | |
| download | pki-08f032de4090467ac4096f970609e19834b997ac.tar.gz pki-08f032de4090467ac4096f970609e19834b997ac.tar.xz pki-08f032de4090467ac4096f970609e19834b997ac.zip | |
Simplified deployment properties for existing CA case.
A new pki_existing deployment property has been added to install
CA with existing CA certificate and key in a single step.
New certificate deployment properties have been added as aliases
for some external CA properties to allow them to be used in more
general cases:
- pki_ca_signing_csr_path -> pki_external_csr_path
- pki_ca_signing_cert_path -> pki_external_ca_cert_path
- pki_cert_chain_path -> pki_external_ca_cert_chain_path
- pki_cert_chain_nickname -> pki_external_ca_cert_chain_nickname
https://fedorahosted.org/pki/ticket/1736
Diffstat (limited to 'base/server/python/pki/server/deployment/pkihelper.py')
| -rw-r--r-- | base/server/python/pki/server/deployment/pkihelper.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/base/server/python/pki/server/deployment/pkihelper.py b/base/server/python/pki/server/deployment/pkihelper.py index cd4e3e26f..f01f6f69f 100644 --- a/base/server/python/pki/server/deployment/pkihelper.py +++ b/base/server/python/pki/server/deployment/pkihelper.py @@ -501,6 +501,7 @@ class ConfigurationFile: self.add_req_ext = config.str2bool( self.mdict['pki_req_ext_add']) + self.existing = config.str2bool(self.mdict['pki_existing']) self.external = config.str2bool(self.mdict['pki_external']) self.external_step_one = not config.str2bool(self.mdict['pki_external_step_two']) self.external_step_two = not self.external_step_one @@ -3786,9 +3787,12 @@ class ConfigClient: self.mdict = deployer.mdict # set useful 'boolean' object variables for this class self.clone = config.str2bool(self.mdict['pki_clone']) + + self.existing = config.str2bool(self.mdict['pki_existing']) self.external = config.str2bool(self.mdict['pki_external']) self.external_step_two = config.str2bool( self.mdict['pki_external_step_two']) + self.standalone = config.str2bool(self.mdict['pki_standalone']) self.subordinate = config.str2bool(self.mdict['pki_subordinate']) # set useful 'string' object variables for this class @@ -3999,7 +4003,8 @@ class ConfigClient: data.tokenPassword = self.mdict['pki_token_password'] data.subsystemName = self.mdict['pki_subsystem_name'] - data.external = self.external + # Process existing CA installation like external CA + data.external = self.external or self.existing data.standAlone = self.standalone if self.standalone: |