diff options
| author | Endi S. Dewata <edewata@redhat.com> | 2016-01-22 17:34:19 +0100 |
|---|---|---|
| committer | Matthew Harmsen <mharmsen@pki.usersys.redhat.com> | 2016-02-22 20:20:11 -0700 |
| commit | 708189e54a505ce0baf9a96ff3ad8b6a9942936e (patch) | |
| tree | b3733a9913874550bd7cd14cb17342e3334bf02d /base/server/python/pki/server/deployment | |
| parent | 5207fe7a28462f24ba47301a717af15057f3be0e (diff) | |
| download | pki-708189e54a505ce0baf9a96ff3ad8b6a9942936e.tar.gz pki-708189e54a505ce0baf9a96ff3ad8b6a9942936e.tar.xz pki-708189e54a505ce0baf9a96ff3ad8b6a9942936e.zip | |
Renamed pki.nss into pki.nssdb.
The pki.nss module has been renamed into pki.nssdb to prevent
conflicts with the nss module.
https://fedorahosted.org/pki/ticket/456
(cherry picked from commit 9609f4e6035d3cdff19a0f78caee2d08b095c8ba)
Diffstat (limited to 'base/server/python/pki/server/deployment')
| -rw-r--r-- | base/server/python/pki/server/deployment/scriptlets/configuration.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/base/server/python/pki/server/deployment/scriptlets/configuration.py b/base/server/python/pki/server/deployment/scriptlets/configuration.py index 16c6ae5da..54f1c6e60 100644 --- a/base/server/python/pki/server/deployment/scriptlets/configuration.py +++ b/base/server/python/pki/server/deployment/scriptlets/configuration.py @@ -28,7 +28,7 @@ from .. import pkimessages as log from .. import pkiscriptlet import pki.encoder -import pki.nss +import pki.nssdb import pki.server import pki.system import pki.util @@ -138,7 +138,7 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): hash_alg=hash_alg) with open(external_csr_path) as f: signing_csr = f.read() - signing_csr = pki.nss.convert_csr(signing_csr, 'pem', 'base64') + signing_csr = pki.nssdb.convert_csr(signing_csr, 'pem', 'base64') subsystem.config['ca.signing.certreq'] = signing_csr # This is needed by IPA to detect step 1 completion. @@ -153,7 +153,7 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): if external_csr_path: with open(external_csr_path) as f: signing_csr = f.read() - signing_csr = pki.nss.convert_csr(signing_csr, 'pem', 'base64') + signing_csr = pki.nssdb.convert_csr(signing_csr, 'pem', 'base64') subsystem.config['ca.signing.certreq'] = signing_csr # If specified, import external CA cert into NSS database. |