From 72cda090d3f680c4d691c8df8ae6a4093781aa7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Fri, 10 Mar 2023 08:20:02 +0100
Subject: [PATCH] fix

---
 scripts/install | 13 ++++---------
 scripts/restore | 41 -----------------------------------------
 tests.toml      | 15 +++++++++++++++
 3 files changed, 19 insertions(+), 50 deletions(-)

diff --git a/scripts/install b/scripts/install
index c2a332d..a5f915e 100644
--- a/scripts/install
+++ b/scripts/install
@@ -13,20 +13,15 @@ source /usr/share/yunohost/helpers
 # RETRIEVE ARGUMENTS FROM THE MANIFEST
 #=================================================
 
-#REMOVEME? synapse_app=$YNH_APP_ARG_SYNAPSE_APP
-#REMOVEME? synapse_domain=$(ynh_app_setting_get --app=$synapse_app --key=domain)
-#REMOVEME? synapse_port=$(ynh_app_setting_get --app=$synapse_app --key=synapse_port)
+synapse_domain=$(ynh_app_setting_get --app=$synapse_app --key=domain)
+synapse_port=$(ynh_app_setting_get --app=$synapse_app --key=synapse_port)
 
 #=================================================
 # STORE SETTINGS FROM MANIFEST
 #=================================================
-#REMOVEME? ynh_script_progression --message="Storing installation settings..." --weight=2
 
-#REMOVEME? ynh_app_setting_set --app=$app --key=domain --value=$domain
-#REMOVEME? ynh_app_setting_set --app=$app --key=path --value=$path
-ynh_app_setting_set --app=$app --key=synapse_app --value=$synapse_app
-#REMOVEME? ynh_app_setting_set --app=$app --key=synapse_domain --value=$synapse_domain
-#REMOVEME? ynh_app_setting_set --app=$app --key=synapse_port --value=$synapse_port
+ynh_app_setting_set --app=$app --key=synapse_domain --value=$synapse_domain
+ynh_app_setting_set --app=$app --key=synapse_port --value=$synapse_port
 
 #=================================================
 # INSTALL DEPENDENCIES
diff --git a/scripts/restore b/scripts/restore
index b856eb4..105d683 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -9,32 +9,6 @@
 source ../settings/scripts/_common.sh
 source /usr/share/yunohost/helpers
 
-#=================================================
-# MANAGE SCRIPT FAILURE
-#=================================================
-
-# Exit if an error occurs during the execution of the script
-#REMOVEME? ynh_abort_if_errors
-
-#=================================================
-# LOAD SETTINGS
-#=================================================
-ynh_script_progression --message="Loading settings..." --weight=1
-
-#REMOVEME? app=$YNH_APP_INSTANCE_NAME
-
-#REMOVEME? domain=$(ynh_app_setting_get --app=$app --key=domain)
-#REMOVEME? path=$(ynh_app_setting_get --app=$app --key=path)
-#REMOVEME? #REMOVEME? install_dir=$(ynh_app_setting_get --app=$app --key=install_dir)
-#REMOVEME? synapse_domain=$(ynh_app_setting_get --app=$app --key=synapse_domain)
-
-#=================================================
-# CHECK IF THE APP CAN BE RESTORED
-#=================================================
-#REMOVEME? ynh_script_progression --message="Validating restoration parameters..." --weight=2
-
-#REMOVEME? test ! -d $install_dir || ynh_die --message="There is already a directory: $install_dir "
-
 #=================================================
 # STANDARD RESTORATION STEPS
 #=================================================
@@ -45,14 +19,6 @@ ynh_script_progression --message="Restoring the NGINX configuration..."
 ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"
 ynh_restore_file --origin_path="/etc/nginx/conf.d/${synapse_domain}.d/$app.endpoint.conf"
 
-#=================================================
-# RECREATE THE DEDICATED USER
-#=================================================
-#REMOVEME? ynh_script_progression --message="Recreating the dedicated system user..." --weight=1
-
-# Create the dedicated user (if not existing)
-#REMOVEME? ynh_system_user_create --username=$app --home_dir="$install_dir"
-
 #=================================================
 # RESTORE THE APP MAIN DIR
 #=================================================
@@ -60,23 +26,16 @@ ynh_script_progression --message="Restoring the app main directory..." --weight=
 
 ynh_restore_file --origin_path="$install_dir"
 
-chmod 750 "$install_dir"
 chmod -R o-rwx "$install_dir"
 chown -R $app:www-data "$install_dir"
 
 #=================================================
 # SPECIFIC RESTORATION
 #=================================================
-# REINSTALL DEPENDENCIES
-#=================================================
-#REMOVEME? ynh_script_progression --message="Reinstalling dependencies..." --weight=7
 
 # Install Nodejs
 ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$nodejs_version
 
-# Install Yarn
-#REMOVEME? ynh_install_extra_app_dependencies --repo="deb https://dl.yarnpkg.com/debian/ stable main" --package="yarn" --key="https://dl.yarnpkg.com/debian/pubkey.gpg"
-
 #=================================================
 # RESTORE SYSTEMD
 #=================================================
diff --git a/tests.toml b/tests.toml
index e69de29..a0d8f0f 100644
--- a/tests.toml
+++ b/tests.toml
@@ -0,0 +1,15 @@
+test_format = 1.0
+
+[default]
+
+    # ------------
+    # Tests to run
+    # ------------
+
+    preinstall = """
+    sudo yunohost tools update apps
+	sudo yunohost app install https://github.com/YunoHost-Apps/synapse_ynh/tree/823f98a8cbe108ad4cc0e38e280a83401dca2b9f -a "domain=sub.domain.tld&server_name=$server_name&is_free_registration=$is_free_registration&jitsi_server=$jitsi_server" --force
+    """
+
+
+		
\ No newline at end of file