From d449e6d6ee5851677815ebd887dddb99f1e37fef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 13 Mar 2023 21:24:49 +0100 Subject: [PATCH] fix --- doc/DISCLAIMER.md | 5 ----- doc/DISCLAIMER_fr.md | 5 ----- doc/POST_INSTALL_fr.md | 7 +++++++ manifest.toml | 13 ++++++++++--- scripts/_common.sh | 2 -- scripts/install | 27 --------------------------- scripts/restore | 3 --- scripts/upgrade | 7 +++---- tests.toml | 0 9 files changed, 20 insertions(+), 49 deletions(-) delete mode 100644 doc/DISCLAIMER.md delete mode 100644 doc/DISCLAIMER_fr.md create mode 100644 doc/POST_INSTALL_fr.md create mode 100644 tests.toml diff --git a/doc/DISCLAIMER.md b/doc/DISCLAIMER.md deleted file mode 100644 index 0cb06eb..0000000 --- a/doc/DISCLAIMER.md +++ /dev/null @@ -1,5 +0,0 @@ -## Configuration - -1. The app will require to complete the registration process after the instllation is complete by **visiting the domain** on which Matomo is installed. -1. The MySQL database credentials will be sent to the **admin mail**. Fill these details while doing the registration process. -1. No LDAP support yet for the app. diff --git a/doc/DISCLAIMER_fr.md b/doc/DISCLAIMER_fr.md deleted file mode 100644 index 737fcc0..0000000 --- a/doc/DISCLAIMER_fr.md +++ /dev/null @@ -1,5 +0,0 @@ -## Configuration - -1. Une fois l'installation terminée, l'application devra terminer le processus d'enregistrement en **visitant le domaine** sur lequel Matomo est installé. -1. Les informations d'identification de la base de données MySQL seront envoyées à **l'email admin**. Remplissez ces détails lors du processus d'inscription. -1. Le support LDAP n'est pas encore implémenté pour cette l'application. diff --git a/doc/POST_INSTALL_fr.md b/doc/POST_INSTALL_fr.md new file mode 100644 index 0000000..4e91e9b --- /dev/null +++ b/doc/POST_INSTALL_fr.md @@ -0,0 +1,7 @@ +Une fois l'installation terminée, l'application devra terminer le processus d'enregistrement en visitant https://__DOMAIN____PATH__. + +Details for MySQL database to be enterted while registration process: + +Database login: __DB_USER +Database name: __DB_NAME__ +Database password: __DB_PWD__ diff --git a/manifest.toml b/manifest.toml index e827009..e90d742 100644 --- a/manifest.toml +++ b/manifest.toml @@ -17,11 +17,11 @@ admindoc = "https://matomo.org/docs" code = "https://github.com/matomo-org/matomo" [integration] -yunohost = ">= 11.1.10" +yunohost = ">= 11.1.15" architectures = "all" multi_instance = true -ldap = "?" -sso = "?" +ldap = false +sso = false disk = "50M" ram.build = "50M" ram.runtime = "50M" @@ -44,6 +44,13 @@ ram.runtime = "50M" type = "user" [resources] + + [resources.sources] + + [resources.sources.main] + url = "https://builds.matomo.org/matomo-4.12.3.tar.gz" + sha256 = "00efe4335c9cee9f269b5e8a337026af7f115c05cde1e9ae47485592372b37ee" + [resources.system_user] [resources.install_dir] diff --git a/scripts/_common.sh b/scripts/_common.sh index bc5a044..a7cc08a 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -4,8 +4,6 @@ # COMMON VARIABLES #================================================= -YNH_PHP_VERSION=8.0 - #================================================= # PERSONAL HELPERS #================================================= diff --git a/scripts/install b/scripts/install index 2b009f9..4f1bef5 100755 --- a/scripts/install +++ b/scripts/install @@ -53,33 +53,6 @@ ynh_add_config --template="../conf/cron" --destination="/etc/cron.d/$app" chown root: "/etc/cron.d/$app" chmod 644 "/etc/cron.d/$app" -#================================================= -# RELOAD NGINX -#================================================= -ynh_script_progression --message="Reloading NGINX web server..." --weight=1 - -ynh_systemd_action --service_name=nginx --action=reload - -#================================================= -# SEND A README FOR THE ADMIN -#================================================= -ynh_script_progression --message="Sending a readme for the admin..." --weight=1 - -message="Matomo was successfully installed - -Please open your $app domain: https://$domain$path - -Complete the registration process from the setup page displayed. -Details for MySQL database to be enterted while registration process: - -Database login: $db_user -Database name: $db_name -Database password: $db_pwd - -If you are facing any problem or want to improve this app, please open a new issue here: https://github.com/YunoHost-Apps/matomo_ynh/issues" - -ynh_send_readme_to_admin "$message" - #================================================= # END OF SCRIPT #================================================= diff --git a/scripts/restore b/scripts/restore index 686047f..a242a22 100755 --- a/scripts/restore +++ b/scripts/restore @@ -28,9 +28,6 @@ ynh_script_progression --message="Restoring the PHP-FPM configuration..." --weig # Restore the file first, so it can have a backup if different ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" -# Recreate a dedicated PHP-FPM config -ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint - #================================================= # RESTORE THE NGINX CONFIGURATION #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index f303339..04f6f37 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -12,7 +12,6 @@ source /usr/share/yunohost/helpers #================================================= # LOAD SETTINGS #================================================= -ynh_script_progression --message="Loading installation settings..." --weight=1 email=$(ynh_user_get_info --username=$admin --key=mail) @@ -28,18 +27,18 @@ upgrade_type=$(ynh_check_app_version_changed) ynh_script_progression --message="Ensuring downward compatibility..." --weight=1 # If admin doesn't exist -if [ -z "$admin" ]; then +if [ -z "${admin:-}" ]; then email=root@$domain fi # If fpm_footprint doesn't exist, create it -if [ -z "$fpm_footprint" ]; then +if [ -z "${fpm_footprint:-}" ]; then fpm_footprint=low ynh_app_setting_set --app=$app --key=fpm_footprint --value=$fpm_footprint fi # If fpm_usage doesn't exist, create it -if [ -z "$fpm_usage" ]; then +if [ -z "${fpm_usage:-}" ]; then fpm_usage=low ynh_app_setting_set --app=$app --key=fpm_usage --value=$fpm_usage fi diff --git a/tests.toml b/tests.toml new file mode 100644 index 0000000..e69de29