From 926f8647d2a676c1dd2e446633eb76cdf1a7bf0c Mon Sep 17 00:00:00 2001
From: Tomas Babej <tbabej@redhat.com>
Date: Thu, 29 May 2014 10:18:21 +0200
Subject: ipaplatform: Change platform dependant code in freeipa to use
 ipaplatform tasks

https://fedorahosted.org/freeipa/ticket/4052

Reviewed-By: Petr Viktorin <pviktori@redhat.com>
---
 ipaserver/install/cainstance.py   | 3 ++-
 ipaserver/install/dsinstance.py   | 3 ++-
 ipaserver/install/httpinstance.py | 5 +++--
 ipaserver/install/ipa_restore.py  | 3 ++-
 ipaserver/install/krbinstance.py  | 3 ++-
 5 files changed, 11 insertions(+), 6 deletions(-)

(limited to 'ipaserver')

diff --git a/ipaserver/install/cainstance.py b/ipaserver/install/cainstance.py
index f52870424..c6221e5e0 100644
--- a/ipaserver/install/cainstance.py
+++ b/ipaserver/install/cainstance.py
@@ -51,6 +51,7 @@ import traceback
 from ipapython import ipautil
 from ipapython import services as ipaservices
 from ipapython import ipaldap
+from ipaplatform import tasks
 from ipaserver.install import service
 from ipaserver.install import installutils
 from ipaserver.install import dsinstance
@@ -1115,7 +1116,7 @@ class CAInstance(service.Service):
         pent = pwd.getpwnam(PKI_USER)
         os.chown(publishdir, 0, pent.pw_gid)
 
-        ipaservices.restore_context(publishdir)
+        tasks.restore_context(publishdir)
 
         return publishdir
 
diff --git a/ipaserver/install/dsinstance.py b/ipaserver/install/dsinstance.py
index 9256c1244..b06c13d90 100644
--- a/ipaserver/install/dsinstance.py
+++ b/ipaserver/install/dsinstance.py
@@ -40,6 +40,7 @@ from ipaserver.install import ldapupdate
 from ipaserver.install import replication
 from ipaserver.install import sysupgrade
 from ipalib import errors
+from ipaplatform import tasks
 from ipalib.constants import CACERT
 from ipapython.dn import DN
 
@@ -602,7 +603,7 @@ class DsInstance(service.Service):
         replacevars = {'KRB5CCNAME': ccache}
         old_values = ipautil.backup_config_and_replace_variables(
             self.fstore, filepath, replacevars=replacevars)
-        ipaservices.restore_context(filepath)
+        tasks.restore_context(filepath)
 
     def __managed_entries(self):
         self._ldap_mod("managed-entries.ldif", self.sub_dict)
diff --git a/ipaserver/install/httpinstance.py b/ipaserver/install/httpinstance.py
index 28a83ff04..979d7ff98 100644
--- a/ipaserver/install/httpinstance.py
+++ b/ipaserver/install/httpinstance.py
@@ -35,6 +35,7 @@ from ipapython import dogtag
 from ipapython.ipa_log_manager import *
 from ipaserver.install import sysupgrade
 from ipalib import api
+from ipaplatform import tasks
 from ipalib.constants import CACERT
 
 HTTPD_DIR = "/etc/httpd"
@@ -317,8 +318,8 @@ class HTTPInstance(service.Service):
         os.chown(certs.NSS_DIR + "/pwdfile.txt", 0, pent.pw_gid )
 
         # Fix SELinux permissions on the database
-        ipaservices.restore_context(certs.NSS_DIR + "/cert8.db")
-        ipaservices.restore_context(certs.NSS_DIR + "/key3.db")
+        tasks.restore_context(certs.NSS_DIR + "/cert8.db")
+        tasks.restore_context(certs.NSS_DIR + "/key3.db")
 
     def __setup_autoconfig(self):
         target_fname = '/usr/share/ipa/html/preferences.html'
diff --git a/ipaserver/install/ipa_restore.py b/ipaserver/install/ipa_restore.py
index 8443dee48..56e522895 100644
--- a/ipaserver/install/ipa_restore.py
+++ b/ipaserver/install/ipa_restore.py
@@ -38,6 +38,7 @@ from ipaserver.install.replication import (wait_for_task, ReplicationManager,
 from ipaserver.install import installutils
 from ipapython import services as ipaservices
 from ipapython import ipaldap
+from ipaplatform import tasks
 from ipaserver.install.ipa_backup import BACKUP_DIR
 
 
@@ -630,7 +631,7 @@ class Restore(admintool.AdminTool):
                 self.log.debug('Creating %s' % dir)
                 os.mkdir(dir, 0770)
                 os.chown(dir, pent.pw_uid, pent.pw_gid)
-                ipaservices.restore_context(dir)
+                tasks.restore_context(dir)
             except Exception, e:
                 # This isn't so fatal as to side-track the restore
                 self.log.error('Problem with %s: %s' % (dir, e))
diff --git a/ipaserver/install/krbinstance.py b/ipaserver/install/krbinstance.py
index 1cfaf3732..9475491e7 100644
--- a/ipaserver/install/krbinstance.py
+++ b/ipaserver/install/krbinstance.py
@@ -45,6 +45,7 @@ import struct
 
 import certs
 from distutils import version
+from ipaplatform import tasks
 
 def update_key_val_in_file(filename, key, val):
     if os.path.exists(filename):
@@ -370,7 +371,7 @@ class KrbInstance(service.Service):
         ipautil.backup_config_and_replace_variables(self.fstore, "/etc/sysconfig/krb5kdc",
                                                     replacevars=replacevars,
                                                     appendvars=appendvars)
-        ipaservices.restore_context("/etc/sysconfig/krb5kdc")
+        tasks.restore_context("/etc/sysconfig/krb5kdc")
 
     def __write_stash_from_ds(self):
         try:
-- 
cgit