diff options
Diffstat (limited to 'ipaserver/install')
| -rw-r--r-- | ipaserver/install/bindinstance.py | 5 | ||||
| -rw-r--r-- | ipaserver/install/cainstance.py | 3 | ||||
| -rw-r--r-- | ipaserver/install/dsinstance.py | 10 | ||||
| -rw-r--r-- | ipaserver/install/ldapupdate.py | 4 | ||||
| -rw-r--r-- | ipaserver/install/plugins/fix_replica_agreements.py | 2 | ||||
| -rw-r--r-- | ipaserver/install/replication.py | 3 | ||||
| -rw-r--r-- | ipaserver/install/service.py | 5 |
7 files changed, 11 insertions, 21 deletions
diff --git a/ipaserver/install/bindinstance.py b/ipaserver/install/bindinstance.py index dff661dd..c14f2423 100644 --- a/ipaserver/install/bindinstance.py +++ b/ipaserver/install/bindinstance.py @@ -27,11 +27,10 @@ import ldap import installutils import service -from ipaserver import ipaldap +from ipaserver.plugins import ldap2 from ipaserver.install.dsinstance import realm_to_serverid from ipaserver.install.cainstance import IPA_CA_CNAME -from ipapython import sysrestore -from ipapython import ipautil +from ipapython import sysrestore, ipautil, ipaldap from ipapython.ipa_log_manager import * from ipapython.dn import DN import ipalib diff --git a/ipaserver/install/cainstance.py b/ipaserver/install/cainstance.py index cba5fc9f..deb9a613 100644 --- a/ipaserver/install/cainstance.py +++ b/ipaserver/install/cainstance.py @@ -48,8 +48,7 @@ import traceback from ipapython import ipautil from ipapython import services as ipaservices - -from ipaserver import ipaldap +from ipapython import ipaldap from ipaserver.install import service from ipaserver.install import installutils from ipaserver.install import dsinstance diff --git a/ipaserver/install/dsinstance.py b/ipaserver/install/dsinstance.py index 25cac6c2..23843d75 100644 --- a/ipaserver/install/dsinstance.py +++ b/ipaserver/install/dsinstance.py @@ -19,29 +19,25 @@ # import shutil -from ipapython.ipa_log_manager import * import pwd import sys import os import re import time import tempfile +import base64 -from ipapython import ipautil -from ipapython import sysrestore +from ipapython.ipa_log_manager import * +from ipapython import ipautil, sysrestore, dogtag, ipaldap from ipapython import services as ipaservices -from ipapython import dogtag - import service import installutils import certs import ldap -from ipaserver import ipaldap from ipaserver.install import ldapupdate from ipaserver.install import replication from ipalib import errors from ipapython.dn import DN -import base64 SERVER_ROOT_64 = "/usr/lib64/dirsrv" SERVER_ROOT_32 = "/usr/lib/dirsrv" diff --git a/ipaserver/install/ldapupdate.py b/ipaserver/install/ldapupdate.py index 2f2e7deb..79aea178 100644 --- a/ipaserver/install/ldapupdate.py +++ b/ipaserver/install/ldapupdate.py @@ -39,13 +39,13 @@ import ldap from ldap.schema.models import ObjectClass, AttributeType from ipaserver.install import installutils -from ipaserver import ipaldap -from ipapython import ipautil +from ipapython import ipautil, ipaldap from ipalib import errors from ipalib import api from ipapython.dn import DN from ipapython.ipa_log_manager import * from ipaserver.install.plugins import PRE_UPDATE, POST_UPDATE +from ipaserver.plugins import ldap2 class BadSyntax(installutils.ScriptError): diff --git a/ipaserver/install/plugins/fix_replica_agreements.py b/ipaserver/install/plugins/fix_replica_agreements.py index bbebbbc0..472e5021 100644 --- a/ipaserver/install/plugins/fix_replica_agreements.py +++ b/ipaserver/install/plugins/fix_replica_agreements.py @@ -19,9 +19,9 @@ import os import pwd +from ipapython import ipaldap from ipaserver.install.plugins import MIDDLE from ipaserver.install.plugins.baseupdate import PreUpdate -from ipaserver import ipaldap from ipaserver.install import replication from ipalib import api diff --git a/ipaserver/install/replication.py b/ipaserver/install/replication.py index 804d046b..076d4f87 100644 --- a/ipaserver/install/replication.py +++ b/ipaserver/install/replication.py @@ -23,11 +23,10 @@ import os import ldap -from ipaserver import ipaldap from ipalib import api, errors from ipapython import services as ipaservices from ipapython.ipa_log_manager import * -from ipapython import ipautil, dogtag +from ipapython import ipautil, dogtag, ipaldap from ipapython.dn import DN CACERT = "/etc/ipa/ca.crt" diff --git a/ipaserver/install/service.py b/ipaserver/install/service.py index 633287e2..83ade903 100644 --- a/ipaserver/install/service.py +++ b/ipaserver/install/service.py @@ -24,14 +24,11 @@ import pwd import time import datetime -from ipapython import sysrestore -from ipapython import ipautil -from ipapython import dogtag +from ipapython import sysrestore, ipautil, dogtag, ipaldap from ipapython import services as ipaservices from ipapython.dn import DN from ipapython.ipa_log_manager import * from ipalib import errors -from ipaserver import ipaldap CACERT = "/etc/ipa/ca.crt" |