diff options
| author | Jan Cholasta <jcholast@redhat.com> | 2016-11-22 17:55:10 +0100 |
|---|---|---|
| committer | Martin Basti <mbasti@redhat.com> | 2016-11-29 14:50:51 +0100 |
| commit | a1f260d021bf5d018e634438fde6b7c81ebbbcef (patch) | |
| tree | 29f979f42913f804514f92ada0cb953fdb6d095f /ipaserver/install | |
| parent | 8e5d2c7014ff6371a3b306e666c301aea1f7a488 (diff) | |
| download | freeipa-a1f260d021bf5d018e634438fde6b7c81ebbbcef.tar.gz freeipa-a1f260d021bf5d018e634438fde6b7c81ebbbcef.tar.xz freeipa-a1f260d021bf5d018e634438fde6b7c81ebbbcef.zip | |
ipapython: move dnssec, p11helper and secrets to ipaserver
The dnssec and secrets subpackages and the p11helper module depend on
ipaplatform.
Move them to ipaserver as they are used only on the server.
https://fedorahosted.org/freeipa/ticket/6474
Reviewed-By: Stanislav Laznicka <slaznick@redhat.com>
Diffstat (limited to 'ipaserver/install')
| -rw-r--r-- | ipaserver/install/cainstance.py | 2 | ||||
| -rw-r--r-- | ipaserver/install/custodiainstance.py | 4 | ||||
| -rw-r--r-- | ipaserver/install/dnskeysyncinstance.py | 2 | ||||
| -rw-r--r-- | ipaserver/install/opendnssecinstance.py | 3 |
4 files changed, 6 insertions, 5 deletions
diff --git a/ipaserver/install/cainstance.py b/ipaserver/install/cainstance.py index 1aa6b8d4e..20fc2b730 100644 --- a/ipaserver/install/cainstance.py +++ b/ipaserver/install/cainstance.py @@ -57,7 +57,7 @@ from ipapython.certdb import get_ca_nickname from ipapython.dn import DN from ipapython.ipa_log_manager import log_mgr,\ standard_logging_setup, root_logger -from ipapython.secrets.kem import IPAKEMKeys +from ipaserver.secrets.kem import IPAKEMKeys from ipaserver.install import certs from ipaserver.install import custodiainstance diff --git a/ipaserver/install/custodiainstance.py b/ipaserver/install/custodiainstance.py index b0c952d68..604a6da3e 100644 --- a/ipaserver/install/custodiainstance.py +++ b/ipaserver/install/custodiainstance.py @@ -1,7 +1,7 @@ # Copyright (C) 2015 FreeIPa Project Contributors, see 'COPYING' for license. -from ipapython.secrets.kem import IPAKEMKeys -from ipapython.secrets.client import CustodiaClient +from ipaserver.secrets.kem import IPAKEMKeys +from ipaserver.secrets.client import CustodiaClient from ipaserver.install.certs import CertDB from ipaplatform.paths import paths from ipaplatform.constants import constants diff --git a/ipaserver/install/dnskeysyncinstance.py b/ipaserver/install/dnskeysyncinstance.py index 28eb3f9d6..76a14f9d9 100644 --- a/ipaserver/install/dnskeysyncinstance.py +++ b/ipaserver/install/dnskeysyncinstance.py @@ -13,7 +13,7 @@ import stat import ldap -from ipapython import p11helper as _ipap11helper +from ipaserver import p11helper as _ipap11helper from ipapython.dnsutil import DNSName from ipaserver.install import service from ipaserver.install import installutils diff --git a/ipaserver/install/opendnssecinstance.py b/ipaserver/install/opendnssecinstance.py index 39b81b6b4..9d0664d99 100644 --- a/ipaserver/install/opendnssecinstance.py +++ b/ipaserver/install/opendnssecinstance.py @@ -13,11 +13,12 @@ from ipaserver.install import service from ipaserver.install import installutils from ipapython.ipa_log_manager import root_logger from ipapython.dn import DN -from ipapython import sysrestore, ipautil, p11helper +from ipapython import sysrestore, ipautil from ipaplatform import services from ipaplatform.constants import constants from ipaplatform.paths import paths from ipalib import errors, api +from ipaserver import p11helper from ipaserver.install import dnskeysyncinstance KEYMASTER = u'dnssecKeyMaster' |