From c1229e0dd54760d31924d4ecfb1ef9235c35b24c Mon Sep 17 00:00:00 2001 From: eric_G <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 19 Dec 2023 10:45:26 +0100 Subject: [PATCH] Testing (#110) * 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 * Update manifest.toml * 5.0.0 (#107) * 5.0.0 * Update manifest.toml * Auto-update README * cleaning * Update manifest.toml * cleaning * Update tests.toml --------- Co-authored-by: yunohost-bot --------- Co-authored-by: yunohost-bot --- README.md | 2 +- README_fr.md | 2 +- manifest.toml | 12 ++++++++---- scripts/change_url | 3 +++ scripts/install | 1 + scripts/restore | 2 +- scripts/upgrade | 1 + tests.toml | 2 +- 8 files changed, 17 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index c4459f7..3ad4412 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.16.0~ynh1 +**Shipped version:** 5.0.0~ynh1 **Demo:** https://demo.matomo.org diff --git a/README_fr.md b/README_fr.md index eaa2901..d687636 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.16.0~ynh1 +**Version incluse :** 5.0.0~ynh1 **Démo :** https://demo.matomo.org diff --git a/manifest.toml b/manifest.toml index 7e4c479..f604fde 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,9 +5,9 @@ name = "Matomo" description.en = "Analytics platform for measuring Web statistics" description.fr = "Plateforme d'analyse de mesure de statistiques Web" -version = "4.16.0~ynh1" +version = "5.0.0~ynh1" -maintainers = [] +maintainers = ["eric_G"] [upstream] license = "GPL-3.0-or-later" @@ -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" @@ -48,8 +51,9 @@ ram.runtime = "50M" [resources.sources] [resources.sources.main] - url = "https://builds.matomo.org/matomo-4.16.0.tar.gz" - sha256 = "385653e35f795935b0d97340c8688d8b15ba85234a0b72320696b990cf4f0959" + url = "https://github.com/matomo-org/matomo/releases/download/5.0.0/matomo-5.0.0.tar.gz" + sha256 = "d72b74dced0a9a93295043646ba1fc4577aa4a7d282b46baf7898933f8bbff65" + autoupdate.strategy = "latest_github_tag" [resources.system_user] diff --git a/scripts/change_url b/scripts/change_url index e25b156..fb8fd35 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -23,6 +23,9 @@ ynh_change_url_nginx_config #================================================= ynh_script_progression --message="Setuping a cron..." --weight=1 +path=$new_path +domain=$new_domain + 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 c992b81..5e3005d 100755 --- a/scripts/install +++ b/scripts/install @@ -23,6 +23,7 @@ ynh_script_progression --message="Setting up source files..." --weight=4 # Download, check integrity, uncompress and patch the source from app.src ynh_setup_source --dest_dir="$install_dir" +chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir" #================================================= diff --git a/scripts/restore b/scripts/restore index adac2db..d8ff46c 100755 --- a/scripts/restore +++ b/scripts/restore @@ -17,6 +17,7 @@ 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" #================================================= @@ -31,7 +32,6 @@ ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < ./ #================================================= ynh_script_progression --message="Restoring the PHP-FPM configuration..." --weight=2 -# 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" ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" diff --git a/scripts/upgrade b/scripts/upgrade index 0d57267..de450cf 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -37,6 +37,7 @@ then fi fi +chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir" #================================================= diff --git a/tests.toml b/tests.toml index 9e01410..0d37965 100644 --- a/tests.toml +++ b/tests.toml @@ -6,4 +6,4 @@ test_format = 1.0 # Commits to test upgrade from # ------------------------------- - test_upgrade_from.9edf3d60.name = "Upgrade from 4.4.0" \ No newline at end of file + test_upgrade_from.990d0ae6d5c98db4de9342bb19e3797c9df0da73.name = "Upgrade from 4.16.0" \ No newline at end of file