IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Always stop dirsrv in 'ipactl stop'

Browse Source 
Ensure that 'ipactl stop' stops the dirsrv instance, even when no other
services are running.

https://fedorahosted.org/freeipa/ticket/3574
This commit is contained in:
Ana Krivokapic
2013-04-26 14:46:17 +02:00
committed by Rob Crittenden
parent d4a0fa34af
commit dfcdd9c403
1 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
install/tools/ipactl
View File

@@ -252,7 +252,6 @@ def ipa_start(options):
def ipa_stop(options): def ipa_stop(options):
dirsrv = ipaservices.knownservices.dirsrv dirsrv = ipaservices.knownservices.dirsrv
svc_list = []
try: try:
svc_list = get_config_from_file() svc_list = get_config_from_file()
except Exception, e: except Exception, e:
@@ -270,9 +269,11 @@ def ipa_stop(options):
finally: finally:
raise IpactlError() raise IpactlError()
if len(svc_list) == 0: try:
# no service to stop print "Stopping Directory Service"
return dirsrv.stop(capture_output=False)
except:
raise IpactlError("Failed to stop Directory Service")
for svc in reversed(svc_list): for svc in reversed(svc_list):
svchandle = ipaservices.service(svc) svchandle = ipaservices.service(svc)
@@ -282,14 +283,11 @@ def ipa_stop(options):
except: except:
emit_err("Failed to stop %s Service" % svc) emit_err("Failed to stop %s Service" % svc)
try:
print "Stopping Directory Service"
dirsrv.stop(capture_output=False)
except:
raise IpactlError("Failed to stop Directory Service")
# remove file with list of started services # remove file with list of started services
os.unlink(ipaservices.SVC_LIST_FILE) try:
os.unlink(ipaservices.SVC_LIST_FILE)
except OSError:
pass
def ipa_restart(options): def ipa_restart(options):