From 8f4a329902fca8100736d66905a309f0889c913a Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 17 Dec 2023 10:15:59 +0100 Subject: [PATCH 1/6] Update manifest.toml --- manifest.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index 5bc1699..ff548cc 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Castopod" description.en = "Hosting platform made for podcasters" description.fr = "Plateforme d'hébergement conçue pour les podcasteurs" -version = "1.7.1~ynh3" +version = "1.7.2~ynh1" maintainers = ["eric_G"] @@ -42,8 +42,8 @@ ram.runtime = "50M" [resources.sources] [resources.sources.main] - url = "https://code.castopod.org/adaures/castopod/uploads/957f673c5f2f55aea9914e213a753845/castopod-1.7.1.zip" - sha256 = "ac97e620bf936ae1d53884ebdd3c43802f072c6316806ffd9b802f99c3922537" + url = "https://code.castopod.org/adaures/castopod/uploads/90fa3ed05c3cd11c99411da6f41c4960/castopod-1.7.2.zip" + sha256 = "cfa886e3f70a54bdd94a99d39f41f86f04ecfafacfae29de674f384dd183de05" in_subdir = true [resources.system_user] From bbfa5dcee94a9a1f4847ccf5d09c538d35bbcdf5 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 17 Dec 2023 09:16:05 +0000 Subject: [PATCH 2/6] 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 0a0c5ed..9742bdc 100755 --- a/README.md +++ b/README.md @@ -32,7 +32,7 @@ Castopod is easy to install and was built on top of CodeIgniter4, a powerful PHP - Multi-tenant: host as many podcasts as you want - Multi-user: add contributors and set roles -**Shipped version:** 1.7.1~ynh3 +**Shipped version:** 1.7.2~ynh1 **Demo:** https://podcast.podlibre.org/@podlibre_fr diff --git a/README_fr.md b/README_fr.md index ff317b3..4444016 100755 --- a/README_fr.md +++ b/README_fr.md @@ -31,7 +31,7 @@ Castopod est une plate-forme d'hébergement gratuite et open source conçue pour - Multi-locataire : hébergez autant de podcasts que vous le souhaitez - Multi-utilisateur : ajouter des contributeurs et définir des rôles -**Version incluse :** 1.7.1~ynh3 +**Version incluse :** 1.7.2~ynh1 **Démo :** https://podcast.podlibre.org/@podlibre_fr From 873a1f8b46d070fd025460922d553e9f4c8b3a45 Mon Sep 17 00:00:00 2001 From: Mateusz <2871798+orhtej2@users.noreply.github.com> Date: Sun, 17 Dec 2023 20:15:54 +0100 Subject: [PATCH 3/6] Ensure Redis is configured --- scripts/upgrade | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/scripts/upgrade b/scripts/upgrade index a95bd4e..c7d163a 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -38,6 +38,13 @@ if [ -z "${fpm_usage:-}" ]; then ynh_app_setting_set --app=$app --key=fpm_usage --value=$fpm_usage fi +# If redis_db doesn't exist, create it +if [ -z "${redis_db:-}" ]; then + # Configure redis + redis_db=$(ynh_redis_get_free_db) + ynh_app_setting_set --app="$app" --key=redis_db --value="$redis_db" +fi + #================================================= # MOVE DATA TO __DATA_DIR__ #================================================= From ab690225c195cc63a593f5813c38d866476b11c5 Mon Sep 17 00:00:00 2001 From: orhtej2 <2871798+orhtej2@users.noreply.github.com> Date: Sun, 17 Dec 2023 21:06:55 +0100 Subject: [PATCH 4/6] Properly restore $data_dir --- scripts/restore | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/scripts/restore b/scripts/restore index 6e0a9ef..2cd0861 100755 --- a/scripts/restore +++ b/scripts/restore @@ -20,6 +20,16 @@ ynh_restore_file --origin_path="$install_dir" chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir" +#================================================= +# RESTORE THE DATA DIRECTORY +#================================================= +ynh_script_progression --message="Restoring the data directory..." --weight=1 + +ynh_restore_file --origin_path="$data_dir" --not_mandatory + +chown -R $app:www-data "$data_dir" +chmod -R 750 $data_dir + #================================================= # RESTORE THE MYSQL DATABASE #================================================= From d01c6e55a1ed3834dc599e63684229de2e70855a Mon Sep 17 00:00:00 2001 From: orhtej2 <2871798+orhtej2@users.noreply.github.com> Date: Sun, 17 Dec 2023 21:10:02 +0100 Subject: [PATCH 5/6] Revert "Properly restore $data_dir" This reverts commit ab690225c195cc63a593f5813c38d866476b11c5. --- scripts/restore | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/scripts/restore b/scripts/restore index 2cd0861..6e0a9ef 100755 --- a/scripts/restore +++ b/scripts/restore @@ -20,16 +20,6 @@ ynh_restore_file --origin_path="$install_dir" chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir" -#================================================= -# RESTORE THE DATA DIRECTORY -#================================================= -ynh_script_progression --message="Restoring the data directory..." --weight=1 - -ynh_restore_file --origin_path="$data_dir" --not_mandatory - -chown -R $app:www-data "$data_dir" -chmod -R 750 $data_dir - #================================================= # RESTORE THE MYSQL DATABASE #================================================= From 66ad3f1d3989e016b7052ee988bfdcb6f81ff602 Mon Sep 17 00:00:00 2001 From: orhtej2 <2871798+orhtej2@users.noreply.github.com> Date: Sun, 17 Dec 2023 21:06:55 +0100 Subject: [PATCH 6/6] Properly restore $data_dir --- scripts/restore | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/scripts/restore b/scripts/restore index 6e0a9ef..2cd0861 100755 --- a/scripts/restore +++ b/scripts/restore @@ -20,6 +20,16 @@ ynh_restore_file --origin_path="$install_dir" chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir" +#================================================= +# RESTORE THE DATA DIRECTORY +#================================================= +ynh_script_progression --message="Restoring the data directory..." --weight=1 + +ynh_restore_file --origin_path="$data_dir" --not_mandatory + +chown -R $app:www-data "$data_dir" +chmod -R 750 $data_dir + #================================================= # RESTORE THE MYSQL DATABASE #=================================================