From 179d51ad6c926eb16c33e275ddb08730a33d9c56 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 29 Aug 2023 20:15:13 +0200 Subject: [PATCH 1/7] Upgrade to v6.0.1 --- manifest.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index 3a266f9..06e6493 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Ampache" description.en = "Web based audio/video streaming application" description.fr = "Application de streaming audio et vidéo" -version = "5.6.1~ynh1" +version = "6.0.1~ynh1" maintainers = [] @@ -43,8 +43,8 @@ ram.runtime = "50M" [resources] [resources.sources.main] - url = "https://github.com/ampache/ampache/releases/download/5.6.1/ampache-5.6.1_all_php8.2.zip" - sha256 = "6b1b278aabfce74bab10384bce67535ee745438798c5fce736607534c93317d9" + url = "https://github.com/ampache/ampache/archive/refs/tags/6.0.1.tar.gz" + sha256 = "0348daa7548ae48694ee590a67fc0dbd6d4cfc9c11641a20b6d4721f1ff30da2" in_subdir = false autoupdate.strategy = "latest_github_tag" From d39a6aacdf01463bfab314d5897273470add6add Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 29 Aug 2023 18:24:54 +0000 Subject: [PATCH 2/7] 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 7c24dc2..428ae9c 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ Ampache is a web based audio/video streaming application and file manager allowi * Integrate with YunoHost users - same username and password * Allow one user to be the administrator (set at the installation) -**Shipped version:** 5.6.1~ynh1 +**Shipped version:** 6.0.1~ynh1 **Demo:** https://ampache.org/demo.html diff --git a/README_fr.md b/README_fr.md index 57defe9..f789f6d 100644 --- a/README_fr.md +++ b/README_fr.md @@ -25,7 +25,7 @@ Ampache is a web based audio/video streaming application and file manager allowi * Integrate with YunoHost users - same username and password * Allow one user to be the administrator (set at the installation) -**Version incluse :** 5.6.1~ynh1 +**Version incluse :** 6.0.1~ynh1 **Démo :** https://ampache.org/demo.html From 9e8ec141d644da6117cc8d78ae0d1fc7d372ed26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 29 Aug 2023 21:20:23 +0200 Subject: [PATCH 3/7] Update manifest.toml --- manifest.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index 06e6493..84fd4e1 100644 --- a/manifest.toml +++ b/manifest.toml @@ -17,7 +17,7 @@ admindoc = "https://github.com/ampache/ampache/wiki" code = "https://github.com/ampache/ampache" [integration] -yunohost = ">= 11.1.20" +yunohost = ">= 11.2" architectures = "all" multi_instance = true ldap = true @@ -43,8 +43,8 @@ ram.runtime = "50M" [resources] [resources.sources.main] - url = "https://github.com/ampache/ampache/archive/refs/tags/6.0.1.tar.gz" - sha256 = "0348daa7548ae48694ee590a67fc0dbd6d4cfc9c11641a20b6d4721f1ff30da2" + url = "https://github.com/ampache/ampache/releases/download/6.0.1/ampache-6.0.1_all_php8.2.zip" + sha256 = "37cf6fa2f3540e7d1ed51db5f0517f0689119c148f7abfcc6eb62864e87f1119" in_subdir = false autoupdate.strategy = "latest_github_tag" From 2646f4e1d8c4bf521ffe832f79701013b7f5a6ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 29 Aug 2023 21:26:40 +0200 Subject: [PATCH 4/7] Update upgrade --- scripts/upgrade | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index ae054bc..79e7ade 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -74,10 +74,12 @@ fi #================================================= ynh_script_progression --message="Updating a configuration file..." --weight=1 -ynh_add_config --template="../conf/ampache.cfg.php" --destination="$install_dir/config/ampache.cfg.php" +(cd $install_dir && ynh_exec_as "$app" php$phpversion bin/cli admin:updateDatabase -e) -chmod 600 "$install_dir/config/ampache.cfg.php" -chown $app: "$install_dir/config/ampache.cfg.php" +#ynh_add_config --template="../conf/ampache.cfg.php" --destination="$install_dir/config/ampache.cfg.php" + +#chmod 600 "$install_dir/config/ampache.cfg.php" +#chown $app: "$install_dir/config/ampache.cfg.php" #================================================= # UPDATE MULTIMEDIA DIRECTORIES From 7918600d2730b9bbc655c3362ff3a619da65870c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 29 Aug 2023 21:27:56 +0200 Subject: [PATCH 5/7] fix --- scripts/restore | 14 +++++++------- scripts/upgrade | 5 +++-- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/scripts/restore b/scripts/restore index 27f21d5..b9e34be 100644 --- a/scripts/restore +++ b/scripts/restore @@ -20,6 +20,13 @@ ynh_restore_file --origin_path="$install_dir" chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir" +#================================================= +# RESTORE THE MYSQL DATABASE +#================================================= +ynh_script_progression --message="Restoring the MySQL database..." --weight=2 + +ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < ./db.sql + #================================================= # RESTORE SYSTEM CONFIGURATIONS #================================================= @@ -35,13 +42,6 @@ mkdir -p "/var/log/$app" chown $app: "/var/log/$app" ynh_restore_file --origin_path="/etc/logrotate.d/$app" -#================================================= -# RESTORE THE MYSQL DATABASE -#================================================= -ynh_script_progression --message="Restoring the MySQL database..." --weight=2 - -ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < ./db.sql - #================================================= # GENERIC FINALIZATION #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 79e7ade..2dcfdd8 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -72,9 +72,9 @@ fi #================================================= # UPDATE A CONFIG FILE #================================================= -ynh_script_progression --message="Updating a configuration file..." --weight=1 +#ynh_script_progression --message="Updating a configuration file..." --weight=1 -(cd $install_dir && ynh_exec_as "$app" php$phpversion bin/cli admin:updateDatabase -e) +#(cd $install_dir && ynh_exec_as "$app" php$phpversion bin/cli admin:updateDatabase -e) #ynh_add_config --template="../conf/ampache.cfg.php" --destination="$install_dir/config/ampache.cfg.php" @@ -96,6 +96,7 @@ if [ "$upgrade_type" == "UPGRADE_APP" ] then ynh_local_curl /update.php?action=update sleep 1 + (cd $install_dir && ynh_exec_as "$app" php$phpversion bin/cli admin:updateDatabase -e) fi #================================================= From 892bb45af42300300418f5bc890339547fbeccff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 29 Aug 2023 22:21:00 +0200 Subject: [PATCH 6/7] Update tests.toml --- tests.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests.toml b/tests.toml index f90bd8f..2454163 100644 --- a/tests.toml +++ b/tests.toml @@ -6,6 +6,6 @@ test_format = 1.0 # Commits to test upgrade from # ------------------------------- - test_upgrade_from.671b7d2129051dc1bef663c38bd55389cce95dc0.name = "Upgrade from 5.6.0" + test_upgrade_from.4680975ce19dbf1fd4af2218d56cd12f43d0ae85.name = "Upgrade from 5.6.1" From 423ed72b2e0ff270a442063e72066d6f7037be3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 29 Aug 2023 22:21:47 +0200 Subject: [PATCH 7/7] Update _common.sh --- scripts/_common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 9241d2f..1db13c2 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -5,7 +5,7 @@ #================================================= # Composer version -YNH_COMPOSER_VERSION="2.5.7" +YNH_COMPOSER_VERSION="2.5.8" #================================================= # PERSONAL HELPERS