diff options
| author | Tomas Babej <tbabej@redhat.com> | 2014-05-29 10:18:21 +0200 |
|---|---|---|
| committer | Petr Viktorin <pviktori@redhat.com> | 2014-06-16 19:48:19 +0200 |
| commit | 926f8647d2a676c1dd2e446633eb76cdf1a7bf0c (patch) | |
| tree | 06c6519941bba3814a4e41d72580db8fd2814421 /install/tools/ipa-server-install | |
| parent | a7c2327a366d2dfbbdde5362e957fad23e233105 (diff) | |
| download | freeipa-926f8647d2a676c1dd2e446633eb76cdf1a7bf0c.tar.gz freeipa-926f8647d2a676c1dd2e446633eb76cdf1a7bf0c.tar.xz freeipa-926f8647d2a676c1dd2e446633eb76cdf1a7bf0c.zip | |
ipaplatform: Change platform dependant code in freeipa to use ipaplatform tasks
https://fedorahosted.org/freeipa/ticket/4052
Reviewed-By: Petr Viktorin <pviktori@redhat.com>
Diffstat (limited to 'install/tools/ipa-server-install')
| -rwxr-xr-x | install/tools/ipa-server-install | 9 |
1 files changed, 5 insertions, 4 deletions
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) |