From 8f46406ccee5ae07b70bdf50b995f8389547b184 Mon Sep 17 00:00:00 2001 From: eric_G <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 2 Nov 2023 16:49:27 +0100 Subject: [PATCH] Testing (#108) * cleaning * cleaning * Auto-update README * Update nginx.conf * Update manifest.toml * Auto-update README * Update manifest.toml * cleaning * cleaning * Update manifest.toml * Auto-update README --------- Co-authored-by: yunohost-bot --- README.md | 2 +- README_fr.md | 2 +- manifest.toml | 4 ++-- scripts/change_url | 5 +---- scripts/install | 8 ++------ scripts/upgrade | 27 ++------------------------- 6 files changed, 9 insertions(+), 39 deletions(-) diff --git a/README.md b/README.md index 296e8a4..ca513e5 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ Matomo is the leading Free/Libre open analytics platform. At the end of the five Matomo aims to be a Free software alternative to Google Analytics and is already used on more than 1,400,000 websites. Privacy is built-in! -**Shipped version:** 4.15.1~ynh2 +**Shipped version:** 4.15.1~ynh3 **Demo:** https://demo.matomo.org diff --git a/README_fr.md b/README_fr.md index 998c2cc..d442afd 100644 --- a/README_fr.md +++ b/README_fr.md @@ -20,7 +20,7 @@ Matomo est la principale plateforme d'analyse ouverte Free/Libre. À la fin du p Matomo se veut une alternative logicielle gratuite à Google Analytics et est déjà utilisé sur plus de 1 400 000 sites Web. La confidentialité est intégrée ! -**Version incluse :** 4.15.1~ynh2 +**Version incluse :** 4.15.1~ynh3 **Démo :** https://demo.matomo.org diff --git a/manifest.toml b/manifest.toml index 3721a02..550d5e6 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Matomo" description.en = "Analytics platform for measuring Web statistics" description.fr = "Plateforme d'analyse de mesure de statistiques Web" -version = "4.15.1~ynh2" +version = "4.15.1~ynh3" maintainers = [] @@ -59,7 +59,7 @@ ram.runtime = "50M" main.url = "/" [resources.apt] - packages = "mariadb-server php8.2-curl php8.2-gd php8.2-cli php8.2-mysql php8.2-xml php8.2-mbstring" + packages = "mariadb-server, php8.2-curl, php8.2-gd, php8.2-cli, php8.2-mysql, php8.2-xml, php8.2-mbstring" [resources.database] type = "mysql" diff --git a/scripts/change_url b/scripts/change_url index 5d55828..e25b156 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -23,10 +23,7 @@ ynh_change_url_nginx_config #================================================= ynh_script_progression --message="Setuping a cron..." --weight=1 -path=$new_path -domain=$new_domain - -ynh_add_config --template="../conf/cron" --destination="/etc/cron.d/$app" +ynh_add_config --template="cron" --destination="/etc/cron.d/$app" chown root: "/etc/cron.d/$app" chmod 644 "/etc/cron.d/$app" diff --git a/scripts/install b/scripts/install index 1654fc2..c992b81 100755 --- a/scripts/install +++ b/scripts/install @@ -15,10 +15,6 @@ source /usr/share/yunohost/helpers email=$(ynh_user_get_info --username=$admin --key=mail) -fpm_footprint="low" -fpm_free_footprint=0 -fpm_usage="low" - #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= @@ -35,12 +31,12 @@ chown -R $app:www-data "$install_dir" ynh_script_progression --message="Configuring PHP-FPM..." --weight=3 # Create a dedicated PHP-FPM config -ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint +ynh_add_fpm_config # Create a dedicated NGINX config ynh_add_nginx_config -ynh_add_config --template="../conf/cron" --destination="/etc/cron.d/$app" +ynh_add_config --template="cron" --destination="/etc/cron.d/$app" chown root: "/etc/cron.d/$app" chmod 644 "/etc/cron.d/$app" diff --git a/scripts/upgrade b/scripts/upgrade index 5ca5dde..0d57267 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -15,29 +15,6 @@ source /usr/share/yunohost/helpers upgrade_type=$(ynh_check_app_version_changed) -#================================================= -# ENSURE DOWNWARD COMPATIBILITY -#================================================= -ynh_script_progression --message="Ensuring downward compatibility..." --weight=1 - -# If fpm_footprint doesn't exist, create it -if [ -z "${fpm_footprint:-}" ]; then - fpm_footprint=low - ynh_app_setting_set --app=$app --key=fpm_footprint --value=$fpm_footprint -fi - -# If fpm_free_footprint doesn't exist, create it -if [ -z "${fpm_free_footprint:-}" ]; then - fpm_free_footprint=0 - ynh_app_setting_set --app=$app --key=fpm_free_footprint --value=$fpm_free_footprint -fi - -# If fpm_usage doesn't exist, create it -if [ -z "${fpm_usage:-}" ]; then - fpm_usage=low - ynh_app_setting_set --app=$app --key=fpm_usage --value=$fpm_usage -fi - #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= @@ -68,12 +45,12 @@ chown -R $app:www-data "$install_dir" ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=2 # Create a dedicated PHP-FPM config -ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint +ynh_add_fpm_config # Create a dedicated NGINX config ynh_add_nginx_config -ynh_add_config --template="../conf/cron" --destination="/etc/cron.d/$app" +ynh_add_config --template="cron" --destination="/etc/cron.d/$app" chown root: "/etc/cron.d/$app" chmod 644 "/etc/cron.d/$app"