From 9f78c7df9f109cdbe5bd23161a6b8e0cb6426b42 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Tue, 30 Jan 2018 10:37:02 +0000
Subject: [PATCH] Consolidate avahi service for xmpp

---
 src/freedombone-app-xmpp | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/freedombone-app-xmpp b/src/freedombone-app-xmpp
index 8d8b3720..95a9f479 100755
--- a/src/freedombone-app-xmpp
+++ b/src/freedombone-app-xmpp
@@ -1144,17 +1144,11 @@ function install_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