From 5c014beb3899fab72aea75639c6c827e63fddd41 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Sat, 9 Dec 2023 22:07:49 +0100
Subject: [PATCH] cleaning

---
 manifest.toml   |  3 +++
 scripts/install |  2 +-
 scripts/restore | 16 +++++++---------
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/manifest.toml b/manifest.toml
index 78e0f56..15bd8b3 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -19,8 +19,11 @@ code = "https://github.com/vector-im/hydrogen-web"
 yunohost = ">= 11.2"
 architectures = "all"
 multi_instance = true
+
 ldap = false
+
 sso = false
+
 disk = "50M"
 ram.build = "50M"
 ram.runtime = "50M"
diff --git a/scripts/install b/scripts/install
index 6c8fb2a..057b5b3 100755
--- a/scripts/install
+++ b/scripts/install
@@ -40,7 +40,7 @@ ynh_add_nginx_config
 #=================================================
 ynh_script_progression --message="Adding a configuration file..." --weight=1
 
-ynh_add_config --template="../conf/config.sample.json" --destination="$install_dir/config.json"
+ynh_add_config --template="config.sample.json" --destination="$install_dir/config.json"
 
 chmod 660 "$install_dir/config.json"
 chown $app:www-data "$install_dir/config.json"
diff --git a/scripts/restore b/scripts/restore
index 16f767b..a5c61fd 100755
--- a/scripts/restore
+++ b/scripts/restore
@@ -10,15 +10,6 @@
 source ../settings/scripts/_common.sh
 source /usr/share/yunohost/helpers
 
-#=================================================
-# STANDARD RESTORATION STEPS
-#=================================================
-# RESTORE THE NGINX CONFIGURATION
-#=================================================
-ynh_script_progression --message="Restoring the NGINX configuration..." --weight=1
-
-ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"
-
 #=================================================
 # RESTORE THE APP MAIN DIR
 #=================================================
@@ -29,6 +20,13 @@ ynh_restore_file --origin_path="$install_dir"
 chmod -R o-rwx "$install_dir"
 chown -R $app:www-data "$install_dir"
 
+#=================================================
+# RESTORE THE NGINX CONFIGURATION
+#=================================================
+ynh_script_progression --message="Restoring the NGINX configuration..." --weight=1
+
+ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"
+
 #=================================================
 # GENERIC FINALIZATION
 #=================================================