From 4d0581bef21865903202a8cd911fd7dec0db7285 Mon Sep 17 00:00:00 2001
From: Alexandre Aubin <alex.aubin@mailoo.org>
Date: Thu, 12 Aug 2021 17:19:45 +0200
Subject: [PATCH] mdns: Misc fixes after tests on the battefield

---
 data/hooks/conf_regen/37-mdns | 6 ++++--
 src/yunohost/domain.py        | 4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/data/hooks/conf_regen/37-mdns b/data/hooks/conf_regen/37-mdns
index 903b41a0f..c85e43a9a 100755
--- a/data/hooks/conf_regen/37-mdns
+++ b/data/hooks/conf_regen/37-mdns
@@ -30,18 +30,20 @@ do_init_regen() {
 do_pre_regen() {
   pending_dir="$1"
 
-  cd /usr/share/yunohost/templates/dnsmasq
+  cd /usr/share/yunohost/templates/mdns
+  mkdir -p ${pending_dir}/etc/systemd/system/
   cp yunomdns.service ${pending_dir}/etc/systemd/system/
 
   getent passwd mdns &>/dev/null || useradd --no-create-home --shell /usr/sbin/nologin --system --user-group mdns
 
+  mkdir -p ${pending_dir}/etc/yunohost
   _generate_config > ${pending_dir}/etc/yunohost/mdns.yml
 }
 
 do_post_regen() {
   regen_conf_files="$1"
 
-  chown mdns:mdns ${pending_dir}/etc/yunohost/mdns.yml
+  chown mdns:mdns /etc/yunohost/mdns.yml
 
   # If we changed the systemd ynh-override conf
   if echo "$regen_conf_files" | sed 's/,/\n/g' | grep -q "^/etc/systemd/system/yunomdns.service$"
diff --git a/src/yunohost/domain.py b/src/yunohost/domain.py
index aaac3a995..bca701dc6 100644
--- a/src/yunohost/domain.py
+++ b/src/yunohost/domain.py
@@ -163,7 +163,7 @@ def domain_add(operation_logger, domain, dyndns=False):
             # because it's one of the major service, but in the long term we
             # should identify the root of this bug...
             _force_clear_hashes(["/etc/nginx/conf.d/%s.conf" % domain])
-            regen_conf(names=["nginx", "metronome", "dnsmasq", "postfix", "rspamd"])
+            regen_conf(names=["nginx", "metronome", "dnsmasq", "postfix", "rspamd", "mdns"])
             app_ssowatconf()
 
     except Exception as e:
@@ -290,7 +290,7 @@ def domain_remove(operation_logger, domain, remove_apps=False, force=False):
             "/etc/nginx/conf.d/%s.conf" % domain, new_conf=None, save=True
         )
 
-    regen_conf(names=["nginx", "metronome", "dnsmasq", "postfix"])
+    regen_conf(names=["nginx", "metronome", "dnsmasq", "postfix", "rspamd", "mdns"])
     app_ssowatconf()
 
     hook_callback("post_domain_remove", args=[domain])