From 1fffe6052efdef30a0a3a5c4a465b42c62226ac2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 3 Feb 2023 09:39:39 +0100 Subject: [PATCH] Fix --- check_process | 24 ------------------------ scripts/restore | 4 ++-- scripts/upgrade | 4 ++-- tests.toml | 18 +++++++++++++++--- 4 files changed, 19 insertions(+), 31 deletions(-) delete mode 100644 check_process diff --git a/check_process b/check_process deleted file mode 100644 index ec0f0de..0000000 --- a/check_process +++ /dev/null @@ -1,24 +0,0 @@ -;; Test complet - ; Manifest - domain="domain.tld" - path="/path" - default_home_server="matrix.org" - is_public=1 - ; Checks - pkg_linter=1 - setup_sub_dir=1 - setup_root=1 - setup_nourl=0 - setup_private=1 - setup_public=1 - upgrade=1 - upgrade=1 from_commit=34d457d13e526997fddb8348650674a7db2247be - backup_restore=1 - multi_instance=1 - change_url=1 -;;; Upgrade options - ; commit=Sep 13, 2021 - name=34d457d13e526997fddb8348650674a7db2247be - manifest_arg=domain=DOMAIN&path=PATH&admin=USER&language=fr&is_public=1&password=pass&port=666& - - \ No newline at end of file diff --git a/scripts/restore b/scripts/restore index 38c3995..d1d9a3e 100644 --- a/scripts/restore +++ b/scripts/restore @@ -26,8 +26,8 @@ ynh_script_progression --message="Restoring the app main directory..." --weight= ynh_restore_file --origin_path="$install_dir" -chmod -R o-rwx "$install_dir" -chown -R $app:www-data "$install_dir" +#chmod -R o-rwx "$install_dir" +#chown -R $app:www-data "$install_dir" #================================================= # GENERIC FINALIZATION diff --git a/scripts/upgrade b/scripts/upgrade index f1901b5..0f37167 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -58,8 +58,8 @@ ynh_script_progression --message="Adding a configuration file..." --weight=1 ynh_add_config --template="../conf/config.json" --destination="$install_dir/config.json" -chmod -R o-rwx "$install_dir" -chown -R $app:www-data "$install_dir" +#chmod -R o-rwx "$install_dir" +#chown -R $app:www-data "$install_dir" #================================================= # NGINX CONFIGURATION diff --git a/tests.toml b/tests.toml index cfb7391..276998c 100644 --- a/tests.toml +++ b/tests.toml @@ -2,8 +2,20 @@ test_format = 1.0 [default] - exclude = [ - "install.nourl" - ] + # ------------ + # Tests to run + # ------------ + + exclude ="install.nourl" + + # ------------------------------- + # Default args to use for install + # ------------------------------- + + default_home_server="matrix.org" + + # ------------------------------- + # Commits to test upgrade from + # ------------------------------- test_upgrade_from.d653976.name = "Upgrade from 23.01"