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

ipaplatform: Use the dirsrv service, not target

Browse Source 
IPA only uses one instance of the directory server. When an instance
is not specified to a call to service.start/stop/restart/...,
use IPA's instance.

Stopping a systemd service is synchronous (bby default), but stopping
a target is not. This will change ensures that the directory server
is actually down when stop() finishes.

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

Reviewed-By: Jan Cholasta <jcholast@redhat.com>
This commit is contained in:
Petr Viktorin 2014-11-11 16:07:37 +01:00 committed by Jan Cholasta
parent a7162e7766
commit e60ef1fe02
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ipaplatform/base/services.py
View File

@ -187,8 +187,7 @@ class SystemdService(PlatformService):
elements = self.systemd_name.split("@") elements = self.systemd_name.split("@")
# Make sure the correct DS instance is returned # Make sure the correct DS instance is returned
if (elements[0] == 'dirsrv' and not instance_name and if elements[0] == 'dirsrv' and not instance_name:
operation == 'is-active'):
return ('dirsrv@%s.service' return ('dirsrv@%s.service'
% str(self.api.env.realm.replace('.', '-'))) % str(self.api.env.realm.replace('.', '-')))