summaryrefslogtreecommitdiffstats
path: root/ipaserver
diff options
context:
space:
mode:
authorAlexander Bokovoy <abokovoy@redhat.com>2011-10-10 15:25:15 +0300
committerMartin Kosek <mkosek@redhat.com>2011-10-24 15:10:11 +0200
commit25d5d7ed939384340c0aa7d00989cbddf4226bcd (patch)
tree3f738da9e1603b5577e1fb2a644b8a3c9a189162 /ipaserver
parentf098b213eb3d2e8e5d47689a226f81a0d1b35262 (diff)
downloadfreeipa-25d5d7ed939384340c0aa7d00989cbddf4226bcd.tar.gz
freeipa-25d5d7ed939384340c0aa7d00989cbddf4226bcd.tar.xz
freeipa-25d5d7ed939384340c0aa7d00989cbddf4226bcd.zip
Add support for systemd environments and use it to support Fedora 16
https://fedorahosted.org/freeipa/ticket/1192
Diffstat (limited to 'ipaserver')
-rw-r--r--ipaserver/install/cainstance.py4
-rw-r--r--ipaserver/install/dsinstance.py6
-rw-r--r--ipaserver/install/krbinstance.py1
3 files changed, 6 insertions, 5 deletions
diff --git a/ipaserver/install/cainstance.py b/ipaserver/install/cainstance.py
index c819957a6..fed4b2cdf 100644
--- a/ipaserver/install/cainstance.py
+++ b/ipaserver/install/cainstance.py
@@ -375,7 +375,7 @@ class CADSInstance(service.Service):
def restart_instance(self):
try:
ipaservices.knownservices.dirsrv.restart(self.serverid)
- if not dsinstance.is_ds_running():
+ if not dsinstance.is_ds_running(self.serverid):
logging.critical("Failed to restart the directory server. See the installation log for details.")
sys.exit(1)
except Exception:
@@ -693,7 +693,7 @@ class CAInstance(service.Service):
def __restart_instance(self):
try:
- self.restart()
+ self.restart(PKI_INSTANCE_NAME)
installutils.wait_for_open_ports('localhost', 9180, 300)
except Exception:
# TODO: roll back here?
diff --git a/ipaserver/install/dsinstance.py b/ipaserver/install/dsinstance.py
index f2b16dfe8..995877c11 100644
--- a/ipaserver/install/dsinstance.py
+++ b/ipaserver/install/dsinstance.py
@@ -107,8 +107,8 @@ def check_ports():
ds_secure = installutils.port_available(636)
return (ds_unsecure, ds_secure)
-def is_ds_running():
- return ipaservices.knownservices.dirsrv.is_running()
+def is_ds_running(server_id=''):
+ return ipaservices.knownservices.dirsrv.is_running(instance_name=server_id)
def has_managed_entries(host_name, dm_password):
"""Check to see if the Managed Entries plugin is available"""
@@ -413,7 +413,7 @@ class DsInstance(service.Service):
def restart(self, instance=''):
try:
super(DsInstance, self).restart(instance)
- if not is_ds_running():
+ if not is_ds_running(instance):
logging.critical("Failed to restart the directory server. See the installation log for details.")
sys.exit(1)
installutils.wait_for_open_ports('localhost', self.open_ports, 300)
diff --git a/ipaserver/install/krbinstance.py b/ipaserver/install/krbinstance.py
index cb090e82e..c3afe96c5 100644
--- a/ipaserver/install/krbinstance.py
+++ b/ipaserver/install/krbinstance.py
@@ -371,6 +371,7 @@ class KrbInstance(service.Service):
self.fstore.backup_file("/etc/dirsrv/ds.keytab")
installutils.create_keytab("/etc/dirsrv/ds.keytab", ldap_principal)
+ update_key_val_in_file("/etc/sysconfig/dirsrv", "KRB5_KTNAME", "/etc/dirsrv/ds.keytab")
update_key_val_in_file("/etc/sysconfig/dirsrv", "export KRB5_KTNAME", "/etc/dirsrv/ds.keytab")
pent = pwd.getpwnam(dsinstance.DS_USER)
os.chown("/etc/dirsrv/ds.keytab", pent.pw_uid, pent.pw_gid)