diff options
Diffstat (limited to 'install')
-rwxr-xr-x | install/tools/ipa-replica-install | 3 | ||||
-rwxr-xr-x | install/tools/ipa-server-install | 9 | ||||
-rw-r--r-- | install/tools/ipa-upgradeconfig | 6 | ||||
-rwxr-xr-x | install/tools/ipactl | 7 |
4 files changed, 15 insertions, 10 deletions
diff --git a/install/tools/ipa-replica-install b/install/tools/ipa-replica-install index 41c1a0533..9452c6fcb 100755 --- a/install/tools/ipa-replica-install +++ b/install/tools/ipa-replica-install @@ -51,6 +51,7 @@ from ipapython.ipa_log_manager import * from ipapython import dogtag from ipapython.dn import DN import ipaclient.ntpconf +from ipaplatform import tasks log_file_name = "/var/log/ipareplica-install.log" REPLICA_INFO_TOP_DIR = None @@ -447,7 +448,7 @@ def check_dns_resolution(host_name, dns_servers): def main(): - ipaservices.check_selinux_status() + tasks.check_selinux_status() safe_options, options, filename = parse_options() if os.geteuid() != 0: diff --git a/install/tools/ipa-server-install b/install/tools/ipa-server-install index 232d84a2c..00614b64e 100755 --- a/install/tools/ipa-server-install +++ b/install/tools/ipa-server-install @@ -78,6 +78,7 @@ from ipapython.ipa_log_manager import * from ipapython.dn import DN import ipaclient.ntpconf +from ipaplatform import tasks uninstalling = False installation_cleanup = True @@ -505,7 +506,7 @@ def uninstall(): adtrustinstance.ADTRUSTInstance(fstore).uninstall() memcacheinstance.MemcacheInstance().uninstall() otpdinstance.OtpdInstance().uninstall() - ipaservices.restore_network_configuration(fstore, sstore) + tasks.restore_network_configuration(fstore, sstore) fstore.restore_all_files() try: os.remove(ANSWER_CACHE) @@ -580,7 +581,7 @@ def main(): if os.getegid() != 0: sys.exit("Must be root to set up server") - ipaservices.check_selinux_status() + tasks.check_selinux_status() signal.signal(signal.SIGTERM, signal_handler) signal.signal(signal.SIGINT, signal_handler) @@ -1036,7 +1037,7 @@ def main(): root_logger.debug("Chosen hostname (%s) differs from system hostname (%s) - change it" \ % (host_name, system_hostname)) # configure /etc/sysconfig/network to contain the custom hostname - ipaservices.backup_and_replace_hostname(fstore, sstore, host_name) + tasks.backup_and_replace_hostname(fstore, sstore, host_name) # Create DS group if it doesn't exist yet dsinstance.create_ds_group() @@ -1156,7 +1157,7 @@ def main(): http.create_instance( realm_name, host_name, domain_name, dm_password, subject_base=options.subject, auto_redirect=options.ui_redirect) - ipaservices.restore_context("/var/cache/ipa/sessions") + tasks.restore_context("/var/cache/ipa/sessions") set_subject_in_config(realm_name, dm_password, ipautil.realm_to_suffix(realm_name), options.subject) diff --git a/install/tools/ipa-upgradeconfig b/install/tools/ipa-upgradeconfig index 265d71c33..e689f7a44 100644 --- a/install/tools/ipa-upgradeconfig +++ b/install/tools/ipa-upgradeconfig @@ -35,7 +35,9 @@ from ipalib import api import SSSDConfig import ipalib.util import ipalib.errors -from ipapython import ipautil, sysrestore, version, services +from ipaplatform import services +from ipaplatform import tasks +from ipapython import ipautil, sysrestore, version from ipapython.config import IPAOptionParser from ipapython.ipa_log_manager import * from ipapython import certmonger @@ -718,7 +720,7 @@ def copy_crl_file(old_path, new_path=None): pent = pwd.getpwnam(cainstance.PKI_USER) os.chown(new_path, pent.pw_uid, pent.pw_gid) - services.restore_context(new_path) + tasks.restore_context(new_path) def migrate_crl_publish_dir(ca): """ diff --git a/install/tools/ipactl b/install/tools/ipactl index fd2913227..77e6ebd7e 100755 --- a/install/tools/ipactl +++ b/install/tools/ipactl @@ -32,6 +32,7 @@ from ipapython.ipaldap import IPAdmin from ipapython.ipautil import wait_for_open_ports, wait_for_open_socket from ipapython import services as ipaservices from ipapython import config, dogtag +from ipaplatform import tasks from ipapython.dn import DN class IpactlError(ScriptError): @@ -171,7 +172,7 @@ def get_config_from_file(): svc_list = [] try: - f = open(ipaservices.get_svc_list_file(), 'r') + f = open(tasks.get_svc_list_file(), 'r') svc_list = json.load(f) except Exception, e: raise IpactlError("Unknown error when retrieving list of services from file: " + str(e)) @@ -211,7 +212,7 @@ def stop_dirsrv(dirsrv): def ipa_start(options): - if os.path.isfile(ipaservices.get_svc_list_file()): + if os.path.isfile(tasks.get_svc_list_file()): emit_err("Existing service file detected!") emit_err("Assuming stale, cleaning and proceeding") # remove file with list of started services @@ -429,7 +430,7 @@ def ipa_status(options): else: svc_list = get_config_from_file() except IpactlError, e: - if os.path.exists(ipaservices.get_svc_list_file()): + if os.path.exists(tasks.get_svc_list_file()): raise e else: svc_list = [] |