mirror of
https://salsa.debian.org/freeipa-team/freeipa.git
synced 2025-02-25 18:55:28 -06:00
Add support for systemd environments and use it to support Fedora 16
https://fedorahosted.org/freeipa/ticket/1192
This commit is contained in:
committed by
Martin Kosek
parent
f098b213eb
commit
25d5d7ed93
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user