From 1f026fae268bc39dee20ca264c2221b0f19b7bdd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 18 Apr 2023 13:38:40 +0200 Subject: [PATCH] Testing (#102) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 4.11.0 * Auto-update README * Upgrade to php8 (#82) * Auto-update README * [autopatch] Add Common Platform Enumeration id to `manifest.json` (#81) * Testing (#80) * 4.11.0 * Auto-update README Co-authored-by: yunohost-bot * [autopatch] Add Common Platform Enumeration id to `manifest.json` Co-authored-by: yalh76 Co-authored-by: Éric Gaspar <46165813+ericgaspar@users.noreply.github.com> Co-authored-by: Yunohost-Bot <> * Auto-update README * Auto-update README * Update manifest.json * Auto-update README * fix upgrade : Missing phpversion var definition, later used around line 117 * Update upgrade * Add php config (#85) * Update manifest.json * Auto-update README * 4.12.0 (#87) * 4.12.0 * Auto-update README Co-authored-by: yunohost-bot * Update install * 4.12.1 * Auto-update README * 4.12.2 * Auto-update README * 4.12.3 * Auto-update README * PHP setup * 4.13.1 * Auto-update README * 4.13.2 * Auto-update README * 4.13.3 * Auto-update README * V2 (#99) * v2 * v2 * Fix * Auto-update README * Update manifest.toml * fix * Auto-update README * Update tests.toml * Auto-update README * Update manifest.toml * Update POST_INSTALL_fr.md * Fix * Auto-update README * fix * Update tests.toml * Update manifest.toml * Auto-update README * Update doc/POST_INSTALL.md Co-authored-by: Alexandre Aubin * Update upgrade * fix --------- Co-authored-by: yunohost-bot Co-authored-by: Alexandre Aubin * Update upgrade * fix * Update manifest.toml * Auto-update README * Update manifest.toml * Fix * Update install * fix * Update manifest.toml * Update manifest.toml * cleaning * Update manifest.toml * Auto-update README --------- Co-authored-by: yunohost-bot Co-authored-by: YunoHost Bot Co-authored-by: yalh76 Co-authored-by: Alexandre Aubin --- README.md | 2 +- README_fr.md | 2 +- manifest.toml | 8 ++++---- scripts/install | 12 ------------ scripts/remove | 12 ------------ scripts/restore | 24 +++++++----------------- 6 files changed, 13 insertions(+), 47 deletions(-) diff --git a/README.md b/README.md index 291ca0a..f8aff19 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.14.0~ynh1 +**Shipped version:** 4.14.2~ynh1 **Demo:** https://demo.matomo.org diff --git a/README_fr.md b/README_fr.md index dddb40f..18c963a 100644 --- a/README_fr.md +++ b/README_fr.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! -**Version incluse :** 4.14.0~ynh1 +**Version incluse :** 4.14.2~ynh1 **Démo :** https://demo.matomo.org diff --git a/manifest.toml b/manifest.toml index ed7206c..5de0abe 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Matomo" description.en = "Open source analytics platform for measuring Web statistics" description.fr = "Plateforme d'analyse open source de mesure de statistiques Web" -version = "4.14.0~ynh1" +version = "4.14.2~ynh1" maintainers = ["Anmol Sharma"] @@ -17,7 +17,7 @@ admindoc = "https://matomo.org/docs" code = "https://github.com/matomo-org/matomo" [integration] -yunohost = ">= 11.1.15" +yunohost = ">= 11.1.17" architectures = "all" multi_instance = true ldap = false @@ -48,8 +48,8 @@ ram.runtime = "50M" [resources.sources] [resources.sources.main] - url = "https://builds.matomo.org/matomo-4.14.0.tar.gz" - sha256 = "76400edaa4d281b63faa1d6e15497438c5e66011d5807bd98bcf4bc4589cdc1d" + url = "https://builds.matomo.org/matomo-4.14.2.tar.gz" + sha256 = "8cfb3fe1b82ded5a9e4a878b9f01ebf85238dba84087088ff117224033700a9a" [resources.system_user] diff --git a/scripts/install b/scripts/install index 29092f6..8bc9dc3 100755 --- a/scripts/install +++ b/scripts/install @@ -38,21 +38,9 @@ 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 -#================================================= -# NGINX CONFIGURATION -#================================================= -ynh_script_progression --message="Configuring NGINX web server..." --weight=2 - # Create a dedicated NGINX config ynh_add_nginx_config -#================================================= -# SPECIFIC SETUP -#================================================= -# SETUP A CRON -#================================================= -ynh_script_progression --message="Setuping a cron..." --weight=1 - ynh_add_config --template="../conf/cron" --destination="/etc/cron.d/$app" chown root: "/etc/cron.d/$app" chmod 644 "/etc/cron.d/$app" diff --git a/scripts/remove b/scripts/remove index 3242cce..a18a484 100755 --- a/scripts/remove +++ b/scripts/remove @@ -17,21 +17,9 @@ ynh_script_progression --message="Removing NGINX web server configuration..." -- # Remove the dedicated NGINX config ynh_remove_nginx_config -#================================================= -# REMOVE PHP-FPM CONFIGURATION -#================================================= -ynh_script_progression --message="Removing PHP-FPM configuration..." --weight=1 - # Remove the dedicated PHP-FPM config ynh_remove_fpm_config -#================================================= -# SPECIFIC REMOVE -#================================================= -# REMOVE VARIOUS FILES -#================================================= -ynh_script_progression --message="Removing various files..." --weight=1 - # Remove a cron file ynh_secure_remove --file="/etc/cron.d/$app" diff --git a/scripts/restore b/scripts/restore index a242a22..71a355d 100755 --- a/scripts/restore +++ b/scripts/restore @@ -20,21 +20,6 @@ ynh_restore_file --origin_path="$install_dir" chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir" -#================================================= -# RESTORE THE PHP-FPM CONFIGURATION -#================================================= -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" - -#================================================= -# RESTORE THE NGINX CONFIGURATION -#================================================= -ynh_script_progression --message="Restoring the NGINX configuration..." --weight=1 - -ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" - #================================================= # RESTORE THE MYSQL DATABASE #================================================= @@ -43,9 +28,14 @@ ynh_script_progression --message="Restoring the MySQL database..." --weight=1 ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < ./db.sql #================================================= -# RESTORE VARIOUS FILES +# RESTORE THE PHP-FPM CONFIGURATION #================================================= -ynh_script_progression --message="Restoring various files..." --weight=1 +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" ynh_restore_file --origin_path="/etc/cron.d/$app" chown root: "/etc/cron.d/$app"