From a1eb17464807b21b966a8c37f9383b32dc4c5e11 Mon Sep 17 00:00:00 2001
From: DDATAA <45762540+Ddataa@users.noreply.github.com>
Date: Fri, 3 Mar 2023 11:09:34 +0000
Subject: [PATCH 1/5] Update upgrade

---
 scripts/upgrade | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index 39afa10..8baf90d 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -192,7 +192,7 @@ ynh_systemd_action --service_name=$app --action="start" --log_path=systemd --lin
 #=================================================
 # We don't test that in CI
 if ! [ ${PACKAGE_CHECK_EXEC:-0} -eq 1 ]; then
-	ynh_add_config --template="/etc/nginx/conf.d/$domain.d/cryptpad.conf" --destination="/etc/nginx/conf.d/$sandboxdomain.d/cryptpad.conf"
+	ynh_add_config --template="nginx.conf" --destination="/etc/nginx/conf.d/$sandboxdomain.d/$app.conf"
 fi
 
 # We authorize access to sandbox domain

From 4643a6b70242fa5f8ac198de606f00e3c52150dd Mon Sep 17 00:00:00 2001
From: DDATAA <45762540+Ddataa@users.noreply.github.com>
Date: Fri, 3 Mar 2023 11:22:25 +0000
Subject: [PATCH 2/5] Update upgrade

---
 scripts/upgrade | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index 8baf90d..fc9bf65 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -192,7 +192,10 @@ ynh_systemd_action --service_name=$app --action="start" --log_path=systemd --lin
 #=================================================
 # We don't test that in CI
 if ! [ ${PACKAGE_CHECK_EXEC:-0} -eq 1 ]; then
-	ynh_add_config --template="nginx.conf" --destination="/etc/nginx/conf.d/$sandboxdomain.d/$app.conf"
+	bck_domain=$domain
+	domain=$sandboxdomain
+	ynh_add_nginx_config
+	domain=$bck_domain
 fi
 
 # We authorize access to sandbox domain

From f7131c82cb0ce65cffb43994af3ff34f2e8d7ca1 Mon Sep 17 00:00:00 2001
From: DDATAA <45762540+Ddataa@users.noreply.github.com>
Date: Fri, 3 Mar 2023 12:26:26 +0000
Subject: [PATCH 3/5] Update upgrade

---
 scripts/upgrade | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index fc9bf65..d41ddce 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -192,10 +192,7 @@ ynh_systemd_action --service_name=$app --action="start" --log_path=systemd --lin
 #=================================================
 # We don't test that in CI
 if ! [ ${PACKAGE_CHECK_EXEC:-0} -eq 1 ]; then
-	bck_domain=$domain
-	domain=$sandboxdomain
-	ynh_add_nginx_config
-	domain=$bck_domain
+	ynh_add_config --template="cryptpad.conf" --destination="/etc/nginx/conf.d/$sandboxdomain.d/$app.conf"
 fi
 
 # We authorize access to sandbox domain

From 545706f8b17f02ee91e593a7285be345beab5206 Mon Sep 17 00:00:00 2001
From: DDATAA <45762540+Ddataa@users.noreply.github.com>
Date: Fri, 3 Mar 2023 12:37:43 +0000
Subject: [PATCH 4/5] Update upgrade

---
 scripts/upgrade | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index d41ddce..8baf90d 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -192,7 +192,7 @@ ynh_systemd_action --service_name=$app --action="start" --log_path=systemd --lin
 #=================================================
 # We don't test that in CI
 if ! [ ${PACKAGE_CHECK_EXEC:-0} -eq 1 ]; then
-	ynh_add_config --template="cryptpad.conf" --destination="/etc/nginx/conf.d/$sandboxdomain.d/$app.conf"
+	ynh_add_config --template="nginx.conf" --destination="/etc/nginx/conf.d/$sandboxdomain.d/$app.conf"
 fi
 
 # We authorize access to sandbox domain

From 6ed4d9aaaa957f5c03a6e03d9276f7bba16e7e84 Mon Sep 17 00:00:00 2001
From: DDATAA <45762540+Ddataa@users.noreply.github.com>
Date: Fri, 3 Mar 2023 12:56:30 +0000
Subject: [PATCH 5/5] Update upgrade

---
 scripts/upgrade | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index 8baf90d..a7424c8 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -123,7 +123,7 @@ ynh_script_progression --message="Setting up sandobx domain: $sandboxdomain" --w
 # We don't test that in CI
 if ! [ ${PACKAGE_CHECK_EXEC:-0} -eq 1 ]; then
 	# If sandboxdomain doesn't exist, create it
-	if [ -z "$sandboxdomain" ]; then
+	if [ -n "$sandboxdomain" ]; then
 		yunohost domain add $sandboxdomain
 		yunohost domain config set $sandboxdomain -a "mail_in=0&mail_out=0"
 	fi