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 /daemons | |
| 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 'daemons')
| -rwxr-xr-x | daemons/dnssec/ipa-dnskeysync-replica | 9 | ||||
| -rwxr-xr-x | daemons/dnssec/ipa-dnskeysyncd | 3 | ||||
| -rwxr-xr-x | daemons/dnssec/ipa-ods-exporter | 7 |
3 files changed, 9 insertions, 10 deletions
diff --git a/daemons/dnssec/ipa-dnskeysync-replica b/daemons/dnssec/ipa-dnskeysync-replica index fbfee93b8..43670d29c 100755 --- a/daemons/dnssec/ipa-dnskeysync-replica +++ b/daemons/dnssec/ipa-dnskeysync-replica @@ -20,10 +20,11 @@ from ipapython.ipa_log_manager import root_logger, standard_logging_setup from ipapython import ipaldap from ipapython import ipautil from ipaplatform.paths import paths - -from ipapython.dnssec.abshsm import sync_pkcs11_metadata, ldap2p11helper_api_params, wrappingmech_name2id -from ipapython.dnssec.ldapkeydb import LdapKeyDB -from ipapython.dnssec.localhsm import LocalHSM +from ipaserver.dnssec.abshsm import (sync_pkcs11_metadata, + ldap2p11helper_api_params, + wrappingmech_name2id) +from ipaserver.dnssec.ldapkeydb import LdapKeyDB +from ipaserver.dnssec.localhsm import LocalHSM DAEMONNAME = 'ipa-dnskeysyncd' PRINCIPAL = None # not initialized yet diff --git a/daemons/dnssec/ipa-dnskeysyncd b/daemons/dnssec/ipa-dnskeysyncd index dfe4cb4be..37c6a02fb 100755 --- a/daemons/dnssec/ipa-dnskeysyncd +++ b/daemons/dnssec/ipa-dnskeysyncd @@ -16,8 +16,7 @@ from ipapython.ipa_log_manager import root_logger, standard_logging_setup from ipapython import ipaldap from ipapython import ipautil from ipaplatform.paths import paths - -from ipapython.dnssec.keysyncer import KeySyncer +from ipaserver.dnssec.keysyncer import KeySyncer # IPA framework initialization api.bootstrap(in_server=True, log=None) # no logging to file diff --git a/daemons/dnssec/ipa-ods-exporter b/daemons/dnssec/ipa-ods-exporter index 66332490a..f2fdaa991 100755 --- a/daemons/dnssec/ipa-ods-exporter +++ b/daemons/dnssec/ipa-ods-exporter @@ -36,10 +36,9 @@ from ipapython.dn import DN from ipapython import ipaldap from ipapython import ipautil from ipaplatform.paths import paths - -from ipapython.dnssec.abshsm import sync_pkcs11_metadata, wrappingmech_name2id -from ipapython.dnssec.ldapkeydb import LdapKeyDB -from ipapython.dnssec.localhsm import LocalHSM +from ipaserver.dnssec.abshsm import sync_pkcs11_metadata, wrappingmech_name2id +from ipaserver.dnssec.ldapkeydb import LdapKeyDB +from ipaserver.dnssec.localhsm import LocalHSM DAEMONNAME = 'ipa-ods-exporter' PRINCIPAL = None # not initialized yet |