Consolidate avahi service for xmpp

src/freedombone-app-xmpp

     echo '    <type>_xmpp._tcp</type>' >> /etc/avahi/services/xmpp.service
     echo "    <port>5222</port>" >> /etc/avahi/services/xmpp.service
     echo '  </service>' >> /etc/avahi/services/xmpp.service
-    echo '</service-group>' >> /etc/avahi/services/xmpp.service
-
-    echo '<?xml version="1.0" standalone="no"?><!--*-nxml-*-->' > /etc/avahi/services/xmpp-server.service
-    echo '<!DOCTYPE service-group SYSTEM "avahi-service.dtd">' >> /etc/avahi/services/xmpp-server.service
-    echo '<service-group>' >> /etc/avahi/services/xmpp-server.service
-    echo '  <name replace-wildcards="yes">%h XMPP S2S</name>' >> /etc/avahi/services/xmpp-server.service
     echo '  <service>' >> /etc/avahi/services/xmpp-server.service
-    echo '    <type>_xmpp-server._tcp</type>' >> /etc/avahi/services/xmpp-server.service
+    echo '    <type>_xmpp._tcp</type>' >> /etc/avahi/services/xmpp-server.service
     echo "    <port>5269</port>" >> /etc/avahi/services/xmpp-server.service
     echo '  </service>' >> /etc/avahi/services/xmpp-server.service
-    echo '</service-group>' >> /etc/avahi/services/xmpp-server.service
+    echo '</service-group>' >> /etc/avahi/services/xmpp.service
 
     systemctl restart avahi-daemon