summaryrefslogtreecommitdiffstats
path: root/base/server/python/pki/server/deployment/pkiparser.py
diff options
context:
space:
mode:
authorEndi S. Dewata <edewata@redhat.com>2016-02-19 08:42:30 +0100
committerAde Lee <alee@redhat.com>2016-02-26 13:12:01 -0500
commit1d58b883ff9d0056d89d74d30f1375ab12d01f03 (patch)
treea91fabd83ddfb0e3424badb49a883acab5c71f72 /base/server/python/pki/server/deployment/pkiparser.py
parent1f2d7dbab0e6a7b26f7aa12b8a58fb4c3a6da825 (diff)
downloadpki-1d58b883ff9d0056d89d74d30f1375ab12d01f03.tar.gz
pki-1d58b883ff9d0056d89d74d30f1375ab12d01f03.tar.xz
pki-1d58b883ff9d0056d89d74d30f1375ab12d01f03.zip
Added mechanism to import system certs via PKCS #12 file.
The installation tool has been modified to provide an optional pki_server_pkcs12_path property to specify a PKCS #12 file containing certificate chain, system certificates, and third-party certificates needed by the subsystem being installed. If the pki_server_pkcs12_path is specified the installation tool will no longer download the certificate chain from the security domain directly, and it will no longer import the PKCS #12 containing the entire master NSS database specified in pki_clone_pkcs12_path. For backward compatibility, if the pki_server_pkcs12_path is not specified the installation tool will use the old mechanism to import the system certificates. The ConfigurationUtils.verifySystemCertificates() has been modified not to catch the exception to help troubleshooting. https://fedorahosted.org/pki/ticket/1742
Diffstat (limited to 'base/server/python/pki/server/deployment/pkiparser.py')
-rw-r--r--base/server/python/pki/server/deployment/pkiparser.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/base/server/python/pki/server/deployment/pkiparser.py b/base/server/python/pki/server/deployment/pkiparser.py
index 77a1cdf2d..ca9ef998f 100644
--- a/base/server/python/pki/server/deployment/pkiparser.py
+++ b/base/server/python/pki/server/deployment/pkiparser.py
@@ -346,6 +346,7 @@ class PKIConfigParser:
'pki_pin',
'pki_replication_password',
'pki_security_domain_password',
+ 'pki_server_pkcs12_password',
'pki_token_password')
print('Loading deployment configuration from ' +