mirror of
https://salsa.debian.org/freeipa-team/freeipa.git
synced 2025-02-25 18:55:28 -06:00
Replace messagebus with modern name dbus
"messagebus" is an old, archaic name for dbus. Upstream dbus has started to move away from the old name. Let's use the modern term in FreeIPA, too. Fixes: https://pagure.io/freeipa/issue/7754 Signed-off-by: Christian Heimes <cheimes@redhat.com> Reviewed-By: Florence Blanc-Renaud <frenaud@redhat.com>
This commit is contained in:
parent
e569afb04e
commit
4124743862
@ -50,7 +50,7 @@ logger = logging.getLogger(__name__)
|
||||
# should make them available through knownservices.<name> and take care of
|
||||
# re-mapping internally, if needed
|
||||
wellknownservices = ['certmonger', 'dirsrv', 'httpd', 'ipa', 'krb5kdc',
|
||||
'messagebus', 'nslcd', 'nscd', 'ntpd', 'portmap',
|
||||
'dbus', 'nslcd', 'nscd', 'ntpd', 'portmap',
|
||||
'rpcbind', 'kadmin', 'sshd', 'autofs', 'rpcgssd',
|
||||
'rpcidmapd', 'pki_tomcatd', 'chronyd', 'domainname',
|
||||
'named', 'ods_enforcerd', 'ods_signerd', 'gssproxy']
|
||||
|
@ -153,8 +153,6 @@ def debian_service_class_factory(name, api=None):
|
||||
return DebianNoService(name, api)
|
||||
if name == 'ipa':
|
||||
return redhat_services.RedHatIPAService(name, api)
|
||||
if name == 'messagebus':
|
||||
return DebianNoService(name, api)
|
||||
if name == 'ntpd':
|
||||
return DebianSysvService("ntp", api)
|
||||
return DebianService(name, api)
|
||||
|
@ -1046,7 +1046,7 @@ class CAInstance(DogtagInstance):
|
||||
# cause files to have a new owner.
|
||||
self.restore_state("user_exists")
|
||||
|
||||
services.knownservices.messagebus.start()
|
||||
services.knownservices.dbus.start()
|
||||
cmonger = services.knownservices.certmonger
|
||||
cmonger.start()
|
||||
|
||||
|
@ -266,7 +266,7 @@ class DogtagInstance(service.Service):
|
||||
"""
|
||||
cmonger = services.knownservices.certmonger
|
||||
cmonger.enable()
|
||||
services.knownservices.messagebus.start()
|
||||
services.knownservices.dbus.start()
|
||||
cmonger.start()
|
||||
|
||||
bus = dbus.SystemBus()
|
||||
@ -338,7 +338,7 @@ class DogtagInstance(service.Service):
|
||||
"for %s", self.subsystem)
|
||||
|
||||
cmonger = services.knownservices.certmonger
|
||||
services.knownservices.messagebus.start()
|
||||
services.knownservices.dbus.start()
|
||||
cmonger.start()
|
||||
|
||||
nicknames = list(self.tracking_reqs)
|
||||
|
@ -361,11 +361,11 @@ def check_dns_resolution(host_name, dns_servers):
|
||||
|
||||
|
||||
def configure_certmonger():
|
||||
messagebus = services.knownservices.messagebus
|
||||
dbus = services.knownservices.dbus
|
||||
try:
|
||||
messagebus.start()
|
||||
dbus.start()
|
||||
except Exception as e:
|
||||
raise ScriptError("Messagebus service unavailable: %s" % str(e),
|
||||
raise ScriptError("dbus service unavailable: %s" % str(e),
|
||||
rval=3)
|
||||
|
||||
# Ensure that certmonger has been started at least once to generate the
|
||||
|
Loading…
Reference in New Issue
Block a user