From 5486550fac1f09e3a2204639f1c349cc8cfc4b55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 2 Nov 2023 16:11:15 +0100 Subject: [PATCH 1/9] cleaning --- scripts/install | 6 +----- scripts/upgrade | 25 +------------------------ 2 files changed, 2 insertions(+), 29 deletions(-) diff --git a/scripts/install b/scripts/install index 1654fc2..12333b9 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,7 +31,7 @@ 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 diff --git a/scripts/upgrade b/scripts/upgrade index 5ca5dde..614a519 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,7 +45,7 @@ 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 From 3413dc6cfa50377ff9f56a946be699ecab6d34cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 2 Nov 2023 16:13:00 +0100 Subject: [PATCH 2/9] cleaning --- scripts/change_url | 5 +---- scripts/install | 2 +- scripts/upgrade | 2 +- 3 files changed, 3 insertions(+), 6 deletions(-) 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 12333b9..c992b81 100755 --- a/scripts/install +++ b/scripts/install @@ -36,7 +36,7 @@ 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 614a519..0d57267 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -50,7 +50,7 @@ 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" From b6b4227721cd440e2072d6c7143f7b0227105d34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 2 Nov 2023 16:13:12 +0100 Subject: [PATCH 3/9] Update manifest.toml --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 440c928..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 = [] From f1aa2ca203ff19f6b81670119ea16be15b517503 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 2 Nov 2023 15:13:16 +0000 Subject: [PATCH 4/9] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 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 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 5/9] 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" From 375037514ba0b517aea056892df02006a9eacde6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 28 Nov 2023 19:35:09 +0100 Subject: [PATCH 6/9] Update manifest.toml --- manifest.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index 550d5e6..7e4c479 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~ynh3" +version = "4.16.0~ynh1" maintainers = [] @@ -48,8 +48,8 @@ ram.runtime = "50M" [resources.sources] [resources.sources.main] - url = "https://builds.matomo.org/matomo-4.15.1.tar.gz" - sha256 = "5e77e2a6b18ba8542a3e4df481c0152dd059de960c49d04f7e789c9bb5753d27" + url = "https://builds.matomo.org/matomo-4.16.0.tar.gz" + sha256 = "385653e35f795935b0d97340c8688d8b15ba85234a0b72320696b990cf4f0959" [resources.system_user] From 00f0d067fae3df059281ba01b582e608d7c874fb Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 28 Nov 2023 18:35:13 +0000 Subject: [PATCH 7/9] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index ca513e5..c4459f7 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~ynh3 +**Shipped version:** 4.16.0~ynh1 **Demo:** https://demo.matomo.org diff --git a/README_fr.md b/README_fr.md index d442afd..eaa2901 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~ynh3 +**Version incluse :** 4.16.0~ynh1 **Démo :** https://demo.matomo.org From 990d0ae6d5c98db4de9342bb19e3797c9df0da73 Mon Sep 17 00:00:00 2001 From: eric_G <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 29 Nov 2023 09:45:57 +0100 Subject: [PATCH 8/9] Testing (#109) * 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 * Update manifest.toml * Auto-update README --------- Co-authored-by: yunohost-bot --- README.md | 2 +- README_fr.md | 2 +- manifest.toml | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index ca513e5..c4459f7 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~ynh3 +**Shipped version:** 4.16.0~ynh1 **Demo:** https://demo.matomo.org diff --git a/README_fr.md b/README_fr.md index d442afd..eaa2901 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~ynh3 +**Version incluse :** 4.16.0~ynh1 **Démo :** https://demo.matomo.org diff --git a/manifest.toml b/manifest.toml index 550d5e6..7e4c479 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~ynh3" +version = "4.16.0~ynh1" maintainers = [] @@ -48,8 +48,8 @@ ram.runtime = "50M" [resources.sources] [resources.sources.main] - url = "https://builds.matomo.org/matomo-4.15.1.tar.gz" - sha256 = "5e77e2a6b18ba8542a3e4df481c0152dd059de960c49d04f7e789c9bb5753d27" + url = "https://builds.matomo.org/matomo-4.16.0.tar.gz" + sha256 = "385653e35f795935b0d97340c8688d8b15ba85234a0b72320696b990cf4f0959" [resources.system_user] From db1bf4e486fd1628e4d41814b6a543b390be8b57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 9 Dec 2023 22:03:19 +0100 Subject: [PATCH 9/9] Update manifest.toml --- manifest.toml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/manifest.toml b/manifest.toml index 7e4c479..f094048 100644 --- a/manifest.toml +++ b/manifest.toml @@ -20,8 +20,11 @@ code = "https://github.com/matomo-org/matomo" yunohost = ">= 11.2" architectures = "all" multi_instance = true + ldap = false + sso = false + disk = "50M" ram.build = "200M" ram.runtime = "50M"