From 271fdbe30fbed26dac2455974d299677e7e9c98f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 4 Mar 2023 19:30:36 +0100 Subject: [PATCH 1/6] cleaning --- manifest.toml | 4 ++-- scripts/remove | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index ec46b73..72f51b2 100644 --- a/manifest.toml +++ b/manifest.toml @@ -23,12 +23,12 @@ cpe = "???" fund = "???" [integration] -yunohost = ">= 11.1.6" +yunohost = ">= 11.1.12" # FIXME: can be replaced by a list of supported archs using the dpkg --print-architecture nomenclature (amd64/i386/armhf/arm64), for example: ["amd64", "i386"] architectures = "all" multi_instance = true # FIXME: replace with true, false, or "not_relevant". Not to confuse with the "sso" key : the "ldap" key corresponds to wether or not a user *can* login on the app using its YunoHost credentials. -ldap = "?" +ldap = "?" # FIXME: replace with true, false, or "not_relevant". Not to confuse with the "ldap" key : the "sso" key corresponds to wether or not a user is *automatically logged-in* on the app when logged-in on the YunoHost portal. sso = "?" # FIXME: replace with an **estimate** minimum disk and RAM requirements. e.g. 20M, 400M, 1G... diff --git a/scripts/remove b/scripts/remove index f314aa1..097c3f4 100755 --- a/scripts/remove +++ b/scripts/remove @@ -27,7 +27,6 @@ source /usr/share/yunohost/helpers #================================================= # REMOVE SYSTEMD SERVICE #================================================= - ynh_script_progression --message="Removing system configurations related to $app..." --weight=1 # This should be a symetric version of what happens in the install script From 9251a8302c645ed9660dbf9973511b9438fb4b75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 4 Mar 2023 19:31:58 +0100 Subject: [PATCH 2/6] cleaning --- manifest.toml | 2 +- tests.toml.example | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index 72f51b2..547f781 100644 --- a/manifest.toml +++ b/manifest.toml @@ -23,7 +23,7 @@ cpe = "???" fund = "???" [integration] -yunohost = ">= 11.1.12" +yunohost = ">= 11.1.13" # FIXME: can be replaced by a list of supported archs using the dpkg --print-architecture nomenclature (amd64/i386/armhf/arm64), for example: ["amd64", "i386"] architectures = "all" multi_instance = true diff --git a/tests.toml.example b/tests.toml.example index b5d9242..1168949 100644 --- a/tests.toml.example +++ b/tests.toml.example @@ -13,7 +13,8 @@ test_format = 1.0 # # You can also decide (though this is discouraged!) to ban/ignore some tests, - exclude = ["install.private", "install.multi"] # NB : you should NOT need this except if you really have a good reason ... + exclude = ["install.private", "install.multi"] # The test IDs to be used in only/exclude statements are: install.root, install.subdir, install.nourl, install.multi, backup_restore, upgrade, upgrade.someCommitId change_url + # NB : you should NOT need this except if you really have a good reason... # For special usecases, sometimes you need to setup other things on the machine # prior to installing the app (such as installing another app) @@ -32,7 +33,7 @@ test_format = 1.0 # and also install args with a "default" provided in the manifest.. # It should only make sense to declare custom args here for args with no default values - args.language = "fr_FR" # NB : you should NOT need those lines unless for custom questions with no obvious/default value + args.language = "fr_FR" # NB: you should NOT need those lines unless for custom questions with no obvious/default value args.multisite = 0 # ------------------------------- From 038c70c64076afc81b659b07bffd9f72d2e4b72e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 7 Mar 2023 22:22:03 +0100 Subject: [PATCH 3/6] Update install --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 4ffc34e..4245199 100755 --- a/scripts/install +++ b/scripts/install @@ -52,7 +52,7 @@ chown -R $app:www-data "$install_dir" #================================================= # SYSTEM CONFIGURATION #================================================= -ynh_script_progression --message="Adding system configurations related to $app ..." --weight=1 +ynh_script_progression --message="Adding system configurations related to $app..." --weight=1 ### `ynh_add_fpm_config` is used to set up a PHP config. ### You can remove it if your app doesn't use PHP. From 99d39ee31cec413e678653a2137bb2e33bfa286a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 7 Mar 2023 22:26:31 +0100 Subject: [PATCH 4/6] Update manifest.toml --- manifest.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index 547f781..2ac0b2c 100644 --- a/manifest.toml +++ b/manifest.toml @@ -27,9 +27,9 @@ yunohost = ">= 11.1.13" # FIXME: can be replaced by a list of supported archs using the dpkg --print-architecture nomenclature (amd64/i386/armhf/arm64), for example: ["amd64", "i386"] architectures = "all" multi_instance = true -# FIXME: replace with true, false, or "not_relevant". Not to confuse with the "sso" key : the "ldap" key corresponds to wether or not a user *can* login on the app using its YunoHost credentials. +# FIXME: replace with true, false, or "not_relevant". Not to confuse with the "sso" key: the "ldap" key corresponds to wether or not a user *can* login on the app using its YunoHost credentials. ldap = "?" -# FIXME: replace with true, false, or "not_relevant". Not to confuse with the "ldap" key : the "sso" key corresponds to wether or not a user is *automatically logged-in* on the app when logged-in on the YunoHost portal. +# FIXME: replace with true, false, or "not_relevant". Not to confuse with the "ldap" key: the "sso" key corresponds to wether or not a user is *automatically logged-in* on the app when logged-in on the YunoHost portal. sso = "?" # FIXME: replace with an **estimate** minimum disk and RAM requirements. e.g. 20M, 400M, 1G... disk = "50M" @@ -99,5 +99,5 @@ ram.runtime = "50M" packages = "deb1, deb2, php8.0-foo, php8.0-bar" [resources.database] - # This will automatically provision/deprovison a mysql DB and store the corresponding credentials in settings $db_user, $db_name, $db_pwd + # This will automatically provision/deprovison a MySQL DB and store the corresponding credentials in settings $db_user, $db_name, $db_pwd type = "mysql" From 2b5437f78989a208079bcc63a95c8a65c6d42f84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 7 Mar 2023 22:27:03 +0100 Subject: [PATCH 5/6] Update tests.toml.example --- tests.toml.example | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests.toml.example b/tests.toml.example index 1168949..3a732e4 100644 --- a/tests.toml.example +++ b/tests.toml.example @@ -14,7 +14,7 @@ test_format = 1.0 # You can also decide (though this is discouraged!) to ban/ignore some tests, exclude = ["install.private", "install.multi"] # The test IDs to be used in only/exclude statements are: install.root, install.subdir, install.nourl, install.multi, backup_restore, upgrade, upgrade.someCommitId change_url - # NB : you should NOT need this except if you really have a good reason... + # NB: you should NOT need this except if you really have a good reason... # For special usecases, sometimes you need to setup other things on the machine # prior to installing the app (such as installing another app) From cde5def003a9ae3a42d820bcda282d2af194f6c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 8 Mar 2023 09:36:13 +0100 Subject: [PATCH 6/6] Update upgrade --- scripts/upgrade | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 7018949..a6b3f17 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -63,7 +63,7 @@ ynh_script_progression --message="Stopping a systemd service..." --weight=1 ynh_systemd_action --service_name=$app --action="stop" --log_path="/var/log/$app/$app.log" #================================================= -# "REBUILD" THE APP (DEPLOY NEW SOURCES, RERUN NPM BUILD, ETC...) +# "REBUILD" THE APP (DEPLOY NEW SOURCES, RERUN NPM BUILD...) #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= @@ -101,7 +101,7 @@ ynh_use_logrotate --non-append ynh_add_fail2ban_config --logpath="/var/log/nginx/${domain}-error.log" --failregex="Regex to match into the log for a failed login" #================================================= -# RECONFIGURE THE APP (UPDATE CONF, APPLY MIGRATIONS, ...) +# RECONFIGURE THE APP (UPDATE CONF, APPLY MIGRATIONS...) #================================================= # UPDATE A CONFIG FILE #=================================================