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>
freeipa · Nov 8, 2018 · ef20bae · ef20bae
1 parent 82af034
commit ef20bae
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 9 deletions.
diff --git a/ipaplatform/base/services.py b/ipaplatform/base/services.py
@@ -50,7 +50,7 @@
 # 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']

diff --git a/ipaplatform/debian/services.py b/ipaplatform/debian/services.py
@@ -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)

diff --git a/ipaserver/install/cainstance.py b/ipaserver/install/cainstance.py
@@ -1046,7 +1046,7 @@ def uninstall(self):
         # 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()
 

diff --git a/ipaserver/install/dogtaginstance.py b/ipaserver/install/dogtaginstance.py
@@ -266,7 +266,7 @@ def configure_certmonger_renewal(self):
         """
         cmonger = services.knownservices.certmonger
         cmonger.enable()
-        services.knownservices.messagebus.start()
+        services.knownservices.dbus.start()
         cmonger.start()
 
         bus = dbus.SystemBus()
@@ -338,7 +338,7 @@ def stop_tracking_certificates(self, stop_certmonger=True):
             "for %s", self.subsystem)
 
         cmonger = services.knownservices.certmonger
-        services.knownservices.messagebus.start()
+        services.knownservices.dbus.start()
         cmonger.start()
 
         nicknames = list(self.tracking_reqs)

diff --git a/ipaserver/install/server/replicainstall.py b/ipaserver/install/server/replicainstall.py
@@ -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