From ba884d5b6d33a54015bf944ce500a457d33dd119 Mon Sep 17 00:00:00 2001
From: Alexandre Aubin <alex.aubin@mailoo.org>
Date: Sat, 3 Oct 2020 16:32:28 +0200
Subject: [PATCH] Get rid of yunohost.local in main domain nginx conf ...
 because this interfer with using yunohost.local for postinstall. Just let it
 be handled by the default vhost

---
 data/hooks/conf_regen/15-nginx           | 4 +---
 data/templates/nginx/yunohost_local.conf | 1 -
 2 files changed, 1 insertion(+), 4 deletions(-)
 delete mode 100644 data/templates/nginx/yunohost_local.conf

diff --git a/data/hooks/conf_regen/15-nginx b/data/hooks/conf_regen/15-nginx
index a7574b070..1d68bbdf8 100755
--- a/data/hooks/conf_regen/15-nginx
+++ b/data/hooks/conf_regen/15-nginx
@@ -73,9 +73,7 @@ do_pre_regen() {
     ynh_render_template "server.tpl.conf" "${nginx_conf_dir}/${domain}.conf"
     ynh_render_template "autoconfig.tpl.xml" "${mail_autoconfig_dir}/config-v1.1.xml"
 
-    [[ $main_domain != $domain ]] \
-      && touch "${domain_conf_dir}/yunohost_local.conf" \
-      || cp yunohost_local.conf "${domain_conf_dir}/yunohost_local.conf"
+    touch "${domain_conf_dir}/yunohost_local.conf"  # Clean legacy conf files
 
   done
 
diff --git a/data/templates/nginx/yunohost_local.conf b/data/templates/nginx/yunohost_local.conf
deleted file mode 100644
index ebf2bd65a..000000000
--- a/data/templates/nginx/yunohost_local.conf
+++ /dev/null
@@ -1 +0,0 @@
-server_name $server_name yunohost.local;