From d6f79b96be3d7dc0adc8bede381c8fa9ebe7a179 Mon Sep 17 00:00:00 2001
From: Sunil Mohan Adapa <sunil@medhas.org>
Date: Fri, 29 Sep 2017 13:10:46 +0530
Subject: [PATCH] Move Avahi files from freedombox-setup

Avahi daemon is being managed in Plinth, so it makes sense for Plinth to be
providing the service files. Service files can be managed so that when service
is not available, it is not advertised using Avahi.

Install service files.

Signed-off-by: Sunil Mohan Adapa <sunil@medhas.org>
Signed-off-by: Joseph Nuthalapati <njoseph@thoughtworks.com>
Signed-off-by: Prachi Srivastava <prachi@swecha.net>
Reviewed-by: James Valleroy <jvalleroy@mailbox.org>
---
 data/etc/avahi/services/domain.service      | 12 ++++++++++++
 data/etc/avahi/services/sftp-ssh.service    | 14 ++++++++++++++
 data/etc/avahi/services/ssh.service         | 12 ++++++++++++
 data/etc/avahi/services/xmpp-server.service | 12 ++++++++++++
 plinth/modules/avahi/__init__.py            |  8 +++++++-
 setup.py                                    |  2 ++
 6 files changed, 59 insertions(+), 1 deletion(-)
 create mode 100644 data/etc/avahi/services/domain.service
 create mode 100644 data/etc/avahi/services/sftp-ssh.service
 create mode 100644 data/etc/avahi/services/ssh.service
 create mode 100644 data/etc/avahi/services/xmpp-server.service

diff --git a/data/etc/avahi/services/domain.service b/data/etc/avahi/services/domain.service
new file mode 100644
index 000000000..f6210c17b
--- /dev/null
+++ b/data/etc/avahi/services/domain.service
@@ -0,0 +1,12 @@
+<?xml version="1.0" standalone='no'?><!--*-nxml-*-->
+<!DOCTYPE service-group SYSTEM "avahi-service.dtd">
+<service-group>
+
+  <name replace-wildcards="yes">%h</name>
+
+  <service>
+    <type>_domain._udp</type>
+    <port>53</port>
+  </service>
+
+</service-group>
diff --git a/data/etc/avahi/services/sftp-ssh.service b/data/etc/avahi/services/sftp-ssh.service
new file mode 100644
index 000000000..bfe1a0fe4
--- /dev/null
+++ b/data/etc/avahi/services/sftp-ssh.service
@@ -0,0 +1,14 @@
+<?xml version="1.0" standalone='no'?><!--*-nxml-*-->
+<!DOCTYPE service-group SYSTEM "avahi-service.dtd">
+<service-group>
+
+  <name replace-wildcards="yes">%h</name>
+
+  <service>
+    <type>_sftp-ssh._tcp</type>
+    <port>22</port>
+    <txt-record>path=/home/fbx</txt-record>
+    <txt-record>u=fbx</txt-record>
+  </service>
+
+</service-group>
diff --git a/data/etc/avahi/services/ssh.service b/data/etc/avahi/services/ssh.service
new file mode 100644
index 000000000..7090f20dd
--- /dev/null
+++ b/data/etc/avahi/services/ssh.service
@@ -0,0 +1,12 @@
+<?xml version="1.0" standalone='no'?><!--*-nxml-*-->
+<!DOCTYPE service-group SYSTEM "avahi-service.dtd">
+<service-group>
+
+  <name replace-wildcards="yes">%h</name>
+
+  <service>
+    <type>_ssh._tcp</type>
+    <port>22</port>
+  </service>
+
+</service-group>
diff --git a/data/etc/avahi/services/xmpp-server.service b/data/etc/avahi/services/xmpp-server.service
new file mode 100644
index 000000000..4dc9b063e
--- /dev/null
+++ b/data/etc/avahi/services/xmpp-server.service
@@ -0,0 +1,12 @@
+<?xml version="1.0" standalone='no'?><!--*-nxml-*-->
+<!DOCTYPE service-group SYSTEM "avahi-service.dtd">
+<service-group>
+
+  <name replace-wildcards="yes">%h</name>
+
+  <service>
+    <type>_xmpp-server._tcp</type>
+    <port>5269</port>
+  </service>
+
+</service-group>
diff --git a/plinth/modules/avahi/__init__.py b/plinth/modules/avahi/__init__.py
index 6e4dd43ba..57d276c26 100644
--- a/plinth/modules/avahi/__init__.py
+++ b/plinth/modules/avahi/__init__.py
@@ -21,6 +21,7 @@ Plinth module for service discovery.
 
 from django.utils.translation import ugettext_lazy as _
 
+from plinth import actions
 from plinth import cfg
 from plinth import service as service_module
 from plinth.menu import main_menu
@@ -35,7 +36,7 @@ is_essential = True
 
 managed_services = ['avahi-daemon']
 
-managed_packages = ['avahi-daemon']
+managed_packages = ['avahi-daemon', 'avahi-utils']
 
 name = _('Service Discovery')
 
@@ -66,6 +67,11 @@ def init():
 def setup(helper, old_version=False):
     """Install and configure the module."""
     helper.install(managed_packages)
+    # Reload avahi-daemon now that first-run does not reboot. After performing
+    # Plinth package installation, new Avahi files will be available and
+    # require restart.
+    helper.call('post', actions.superuser_run, 'service',
+                ['reload', 'avahi-daemon'])
 
 
 class AvahiServiceView(ServiceView):
diff --git a/setup.py b/setup.py
index 1eb6ef043..6f1b3e89e 100755
--- a/setup.py
+++ b/setup.py
@@ -235,6 +235,8 @@ setuptools.setup(
                  glob.glob('data/etc/apache2/sites-available/*.conf')),
                 ('/etc/apache2/includes',
                  glob.glob('data/etc/apache2/includes/*.conf')),
+                ('/etc/avahi/services/',
+                 glob.glob('data/etc/avahi/services/*.service')),
                 ('/etc/ikiwiki',
                  glob.glob('data/etc/ikiwiki/*.setup')),
                 ('/etc/NetworkManager/dispatcher.d/',