From 6a72db590dee86c6d71b9498dfdbd605e0bea3b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 11 Mar 2023 18:03:20 +0100 Subject: [PATCH 01/45] source --- conf/app.src | 6 ------ manifest.toml | 9 ++++++++- 2 files changed, 8 insertions(+), 7 deletions(-) delete mode 100755 conf/app.src diff --git a/conf/app.src b/conf/app.src deleted file mode 100755 index b55216a..0000000 --- a/conf/app.src +++ /dev/null @@ -1,6 +0,0 @@ -SOURCE_URL=https://code.castopod.org/adaures/castopod/uploads/ab09b21e1e0f3ef02518fc0794d6a3be/castopod-1.1.2.zip -SOURCE_SUM=1412a4d272826355c039ac045055ce33a0c00d238ac860c7761d8f2555b4241a -SOURCE_SUM_PRG=sha256sum -SOURCE_FORMAT=zip -SOURCE_IN_SUBDIR=true -SOURCE_EXTRACT=true diff --git a/manifest.toml b/manifest.toml index 0816022..510d3eb 100644 --- a/manifest.toml +++ b/manifest.toml @@ -17,7 +17,7 @@ admindoc = "https://docs.castopod.org/" code = "https://code.castopod.org/adaures/castopod" [integration] -yunohost = ">= 11.1.13" +yunohost = ">= 11.1.15" architectures = "all" multi_instance = true ldap = false @@ -40,6 +40,13 @@ ram.runtime = "50M" default = "visitors" [resources] + + [resources.sources] + + [resources.sources.main] + url = "https://code.castopod.org/adaures/castopod/uploads/ab09b21e1e0f3ef02518fc0794d6a3be/castopod-1.1.2.zip" + sha256 = "1412a4d272826355c039ac045055ce33a0c00d238ac860c7761d8f2555b4241a" + [resources.system_user] [resources.install_dir] From 5aa36f1c40d95f4fb79822b1f415881aca4e9cbe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 31 Mar 2023 21:45:37 +0200 Subject: [PATCH 02/45] Update manifest.toml --- manifest.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index 510d3eb..92e78ac 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.1.2~ynh2" +version = "1.1.4~ynh1" maintainers = ["eric_G"] @@ -44,8 +44,8 @@ ram.runtime = "50M" [resources.sources] [resources.sources.main] - url = "https://code.castopod.org/adaures/castopod/uploads/ab09b21e1e0f3ef02518fc0794d6a3be/castopod-1.1.2.zip" - sha256 = "1412a4d272826355c039ac045055ce33a0c00d238ac860c7761d8f2555b4241a" + url = "https://code.castopod.org/adaures/castopod/uploads/97a3dc85646f278003b4a95951e2fa21/castopod-1.2.4.zip" + sha256 = "fc69044b12e233b7bf45e75e400bb814fc3aad0489cbf49b375df7fc43dc0587" [resources.system_user] From 021d23ac8a52de1dcda8b2e5223d7d08e8cd1f1c Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 31 Mar 2023 19:45:43 +0000 Subject: [PATCH 03/45] 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 9b2a7ca..d010d5c 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.1.2~ynh2 +**Shipped version:** 1.1.4~ynh1 **Demo:** https://podcast.podlibre.org/@podlibre_fr diff --git a/README_fr.md b/README_fr.md index 9b3f0e8..4703703 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.1.2~ynh2 +**Version incluse :** 1.1.4~ynh1 **Démo :** https://podcast.podlibre.org/@podlibre_fr From 019144ac540ed26bb7144e6a46a60709689b4fe6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 31 Mar 2023 21:47:26 +0200 Subject: [PATCH 04/45] Update .env.example --- conf/.env.example | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/.env.example b/conf/.env.example index a203646..bf496f9 100644 --- a/conf/.env.example +++ b/conf/.env.example @@ -14,7 +14,7 @@ # Instance configuration #-------------------------------------------------------------------- app.baseURL="https://__DOMAIN__" -app.mediaBaseURL="https://__DOMAIN__" +media.baseURL="https://__DOMAIN__" admin.gateway="cp-admin" auth.gateway="cp-auth" From 5834e930af63235b4d4472f659f4922e3dbdf5ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 3 Apr 2023 14:22:54 +0200 Subject: [PATCH 05/45] Update manifest.toml --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 92e78ac..038e430 100644 --- a/manifest.toml +++ b/manifest.toml @@ -17,7 +17,7 @@ admindoc = "https://docs.castopod.org/" code = "https://code.castopod.org/adaures/castopod" [integration] -yunohost = ">= 11.1.15" +yunohost = ">= 11.1.16" architectures = "all" multi_instance = true ldap = false From 96893e6b5be5b49e048eca68130050f10f29f15f Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 22 Apr 2023 19:59:01 +0200 Subject: [PATCH 06/45] 1.3.3 --- manifest.toml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/manifest.toml b/manifest.toml index 038e430..3e08369 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.1.4~ynh1" +version = "1.3.3~ynh1" maintainers = ["eric_G"] @@ -17,7 +17,7 @@ admindoc = "https://docs.castopod.org/" code = "https://code.castopod.org/adaures/castopod" [integration] -yunohost = ">= 11.1.16" +yunohost = ">= 11.1.18" architectures = "all" multi_instance = true ldap = false @@ -44,8 +44,8 @@ ram.runtime = "50M" [resources.sources] [resources.sources.main] - url = "https://code.castopod.org/adaures/castopod/uploads/97a3dc85646f278003b4a95951e2fa21/castopod-1.2.4.zip" - sha256 = "fc69044b12e233b7bf45e75e400bb814fc3aad0489cbf49b375df7fc43dc0587" + url = "https://code.castopod.org/adaures/castopod/uploads/ade2c7581ffcd7eb4dde8d694bb3b702/castopod-1.3.3.zip" + sha256 = "7fef7589d36fa3baecc4caf875e3d3bb1c66ca8564162000af6c71e56e8122f9" [resources.system_user] From 2c69812fe9d07b57c814767fbf3480a44c985db4 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sat, 22 Apr 2023 17:59:06 +0000 Subject: [PATCH 07/45] 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 d010d5c..d223223 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.1.4~ynh1 +**Shipped version:** 1.3.3~ynh1 **Demo:** https://podcast.podlibre.org/@podlibre_fr diff --git a/README_fr.md b/README_fr.md index 4703703..c441a5a 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.1.4~ynh1 +**Version incluse :** 1.3.3~ynh1 **Démo :** https://podcast.podlibre.org/@podlibre_fr From a05237c52cd20a973a8dae5a7c54b9f734c2b27b Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 22 Apr 2023 20:02:49 +0200 Subject: [PATCH 08/45] cleaning --- doc/DESCRIPTION.md | 1 - doc/DESCRIPTION_fr.md | 1 - scripts/install | 5 ----- 3 files changed, 7 deletions(-) diff --git a/doc/DESCRIPTION.md b/doc/DESCRIPTION.md index 9fdd754..f746187 100644 --- a/doc/DESCRIPTION.md +++ b/doc/DESCRIPTION.md @@ -1,7 +1,6 @@ Castopod is a free & open-source hosting platform made for podcasters who want engage and interact with their audience. Castopod is easy to install and was built on top of CodeIgniter4, a powerful PHP framework with a very small footprint. - ### Features - Focused on data sovereignty: your content, audience, and analytics belong to you, and you only diff --git a/doc/DESCRIPTION_fr.md b/doc/DESCRIPTION_fr.md index cb451e4..c4f4e95 100644 --- a/doc/DESCRIPTION_fr.md +++ b/doc/DESCRIPTION_fr.md @@ -1,6 +1,5 @@ Castopod est une plate-forme d'hébergement gratuite et open source conçue pour les podcasteurs qui souhaitent interagir avec leur public. - ### Caractéristiques - Axé sur la souveraineté des données : votre contenu, votre audience et vos analyses vous appartiennent, et vous seul diff --git a/scripts/install b/scripts/install index 58de286..1956f70 100755 --- a/scripts/install +++ b/scripts/install @@ -17,11 +17,6 @@ fpm_footprint="low" fpm_free_footprint=0 fpm_usage="low" -#================================================= -# STORE SETTINGS FROM MANIFEST -#================================================= -ynh_script_progression --message="Storing installation settings..." --weight=1 - ynh_app_setting_set --app=$app --key=fpm_footprint --value=$fpm_footprint ynh_app_setting_set --app=$app --key=fpm_free_footprint --value=$fpm_free_footprint ynh_app_setting_set --app=$app --key=fpm_usage --value=$fpm_usage From 4b4521a2d2765ca3bcd27480d234bf75672aab4d Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sat, 22 Apr 2023 18:03:01 +0000 Subject: [PATCH 09/45] Auto-update README --- README.md | 1 - README_fr.md | 1 - 2 files changed, 2 deletions(-) diff --git a/README.md b/README.md index d223223..803c0be 100755 --- a/README.md +++ b/README.md @@ -19,7 +19,6 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Castopod is a free & open-source hosting platform made for podcasters who want engage and interact with their audience. Castopod is easy to install and was built on top of CodeIgniter4, a powerful PHP framework with a very small footprint. - ### Features - Focused on data sovereignty: your content, audience, and analytics belong to you, and you only diff --git a/README_fr.md b/README_fr.md index c441a5a..38395ae 100755 --- a/README_fr.md +++ b/README_fr.md @@ -18,7 +18,6 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po Castopod est une plate-forme d'hébergement gratuite et open source conçue pour les podcasteurs qui souhaitent interagir avec leur public. - ### Caractéristiques - Axé sur la souveraineté des données : votre contenu, votre audience et vos analyses vous appartiennent, et vous seul From 0abfb6fe216043f94c15afec3ab0658b9308a9e3 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 22 Apr 2023 20:55:58 +0200 Subject: [PATCH 10/45] Update .env.example --- conf/.env.example | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/.env.example b/conf/.env.example index bf496f9..ee45cde 100644 --- a/conf/.env.example +++ b/conf/.env.example @@ -13,8 +13,8 @@ #-------------------------------------------------------------------- # Instance configuration #-------------------------------------------------------------------- -app.baseURL="https://__DOMAIN__" -media.baseURL="https://__DOMAIN__" +app.baseURL="https://__DOMAIN__/" +media.baseURL="https://__DOMAIN__/" admin.gateway="cp-admin" auth.gateway="cp-auth" From c4789a1f741bf038916387a0a1153ae71ea8294c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 22 Apr 2023 21:11:45 +0200 Subject: [PATCH 11/45] Update manifest.toml --- manifest.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/manifest.toml b/manifest.toml index 3e08369..b1bcce6 100644 --- a/manifest.toml +++ b/manifest.toml @@ -46,6 +46,7 @@ ram.runtime = "50M" [resources.sources.main] url = "https://code.castopod.org/adaures/castopod/uploads/ade2c7581ffcd7eb4dde8d694bb3b702/castopod-1.3.3.zip" sha256 = "7fef7589d36fa3baecc4caf875e3d3bb1c66ca8564162000af6c71e56e8122f9" + in_subdir = true [resources.system_user] From c1b6275c385e80f969c4649682ce05f922478629 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 31 May 2023 18:40:49 +0200 Subject: [PATCH 12/45] Update manifest.toml --- manifest.toml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/manifest.toml b/manifest.toml index b1bcce6..2b7475f 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.3.3~ynh1" +version = "1.3.5~ynh1" maintainers = ["eric_G"] @@ -17,7 +17,7 @@ admindoc = "https://docs.castopod.org/" code = "https://code.castopod.org/adaures/castopod" [integration] -yunohost = ">= 11.1.18" +yunohost = ">= 11.1.19" architectures = "all" multi_instance = true ldap = false @@ -44,8 +44,8 @@ ram.runtime = "50M" [resources.sources] [resources.sources.main] - url = "https://code.castopod.org/adaures/castopod/uploads/ade2c7581ffcd7eb4dde8d694bb3b702/castopod-1.3.3.zip" - sha256 = "7fef7589d36fa3baecc4caf875e3d3bb1c66ca8564162000af6c71e56e8122f9" + url = "https://code.castopod.org/adaures/castopod/uploads/6d9b398cab3cbde3b88512d497988073/castopod-1.3.5.zip" + sha256 = "e0d84a3427e5c0a617bd713c3cec71b0aa245d3c1b117aeeb825d7923ed4ab9b" in_subdir = true [resources.system_user] From 9919c38c53a2fa6329894b94048ca71715c1ef7d Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 31 May 2023 16:40:54 +0000 Subject: [PATCH 13/45] 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 803c0be..0b55292 100755 --- a/README.md +++ b/README.md @@ -31,7 +31,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.3.3~ynh1 +**Shipped version:** 1.3.5~ynh1 **Demo:** https://podcast.podlibre.org/@podlibre_fr diff --git a/README_fr.md b/README_fr.md index 38395ae..b2a2e5b 100755 --- a/README_fr.md +++ b/README_fr.md @@ -30,7 +30,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.3.3~ynh1 +**Version incluse :** 1.3.5~ynh1 **Démo :** https://podcast.podlibre.org/@podlibre_fr From c8e37e46b055c985e224b457a06097736eb2cf4f Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 16 Jul 2023 10:20:06 +0200 Subject: [PATCH 14/45] fix --- conf/cron | 5 +---- manifest.toml | 6 +++--- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/conf/cron b/conf/cron index cd2baf3..8996e3c 100644 --- a/conf/cron +++ b/conf/cron @@ -1,4 +1 @@ -* * * * * __APP__ /usr/bin/php__PHPVERSION__ __INSTALL_DIR__/public/index.php scheduled-activities -* * * * * __APP__ /usr/bin/php__PHPVERSION__ __INSTALL_DIR__/public/index.php scheduled-video-clips -* * * * * __APP__ /usr/bin/php__PHPVERSION__ __INSTALL_DIR__/public/index.php scheduled-websub-publish - +* * * * * __APP__ /usr/bin/php__PHPVERSION__ __INSTALL_DIR__/spark tasks:run >> /dev/null 2>&1 diff --git a/manifest.toml b/manifest.toml index 2b7475f..a419403 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.3.5~ynh1" +version = "1.4.6~ynh1" maintainers = ["eric_G"] @@ -44,8 +44,8 @@ ram.runtime = "50M" [resources.sources] [resources.sources.main] - url = "https://code.castopod.org/adaures/castopod/uploads/6d9b398cab3cbde3b88512d497988073/castopod-1.3.5.zip" - sha256 = "e0d84a3427e5c0a617bd713c3cec71b0aa245d3c1b117aeeb825d7923ed4ab9b" + url = "https://code.castopod.org/adaures/castopod/uploads/848012e14d67cfee058c6085e4dfa6a3/castopod-1.4.6.zip" + sha256 = "7738818ef3fa43914087033b71c835366d7ad398985733506fc0e77fb075d0be" in_subdir = true [resources.system_user] From 0fa3ad89d4566388b2ef57934a9c21781fc1740c Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 16 Jul 2023 08:20:12 +0000 Subject: [PATCH 15/45] 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 0b55292..37f902c 100755 --- a/README.md +++ b/README.md @@ -31,7 +31,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.3.5~ynh1 +**Shipped version:** 1.4.6~ynh1 **Demo:** https://podcast.podlibre.org/@podlibre_fr diff --git a/README_fr.md b/README_fr.md index b2a2e5b..9983a89 100755 --- a/README_fr.md +++ b/README_fr.md @@ -30,7 +30,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.3.5~ynh1 +**Version incluse :** 1.4.6~ynh1 **Démo :** https://podcast.podlibre.org/@podlibre_fr From f6706430deaf24bdfd1c04b562cc28ab2ab8fee4 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 16 Jul 2023 10:20:26 +0200 Subject: [PATCH 16/45] Update manifest.toml --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index a419403..058233d 100644 --- a/manifest.toml +++ b/manifest.toml @@ -17,7 +17,7 @@ admindoc = "https://docs.castopod.org/" code = "https://code.castopod.org/adaures/castopod" [integration] -yunohost = ">= 11.1.19" +yunohost = ">= 11.1.21" architectures = "all" multi_instance = true ldap = false From bcc1f9346570a538437adbe596e5891182d8ff6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 16 Jul 2023 18:23:56 +0200 Subject: [PATCH 17/45] Update install --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 1956f70..292a52a 100755 --- a/scripts/install +++ b/scripts/install @@ -52,7 +52,7 @@ chmod 644 "/etc/cron.d/$app" #================================================= # CONFIGURE CASTOPOD #================================================= -ynh_script_progression --message="Configuring Castopod..." --weight=1 +ynh_script_progression --message="Configuring $app..." --weight=1 # Configure redis redis_db=$(ynh_redis_get_free_db) From 6b833ceaab2d5a04e6895a2a80b7f89bed3a573c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 16 Jul 2023 18:34:53 +0200 Subject: [PATCH 18/45] Update .env.example --- conf/.env.example | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/.env.example b/conf/.env.example index ee45cde..aa51907 100644 --- a/conf/.env.example +++ b/conf/.env.example @@ -9,7 +9,7 @@ # - replace all the default settings with your values # - go to `/cp-install` to complete installation #-------------------------------------------------------------------- - +CI_ENVIRONMENT=development #-------------------------------------------------------------------- # Instance configuration #-------------------------------------------------------------------- From 7d24bec432246ff00de4f89f979bcac8fb014f96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 16 Jul 2023 18:37:52 +0200 Subject: [PATCH 19/45] Update manifest.toml --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 058233d..de715c0 100644 --- a/manifest.toml +++ b/manifest.toml @@ -56,7 +56,7 @@ ram.runtime = "50M" main.url = "/" [resources.apt] - packages = "mariadb-server ffmpeg php8.1-fpm php8.1-mysql php8.1-gd php8.1-intl php8.1-curl php8.1-mbstring php8.1-xml php8.1-mysqlnd" + packages = "mariadb-server ffmpeg libcurl php8.1-fpm php8.1-gd php8.1-intl php8.1-curl php8.1-exif php8.1-mbstring php8.1-xml php8.1-mysqlnd" [resources.database] type = "mysql" From 0518530f67a1e42d95f1f5454b151dca7332734c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 16 Jul 2023 18:39:57 +0200 Subject: [PATCH 20/45] Update manifest.toml --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index de715c0..21e90bd 100644 --- a/manifest.toml +++ b/manifest.toml @@ -56,7 +56,7 @@ ram.runtime = "50M" main.url = "/" [resources.apt] - packages = "mariadb-server ffmpeg libcurl php8.1-fpm php8.1-gd php8.1-intl php8.1-curl php8.1-exif php8.1-mbstring php8.1-xml php8.1-mysqlnd" + packages = "mariadb-server ffmpeg php8.1-fpm php8.1-gd php8.1-intl php8.1-curl php8.1-exif php8.1-mbstring php8.1-xml php8.1-mysqlnd" [resources.database] type = "mysql" From ffe32e170d125849efc7ba49d8a3a23eae9d85f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 16 Jul 2023 18:43:39 +0200 Subject: [PATCH 21/45] Update .env.example --- conf/.env.example | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/.env.example b/conf/.env.example index aa51907..2001a07 100644 --- a/conf/.env.example +++ b/conf/.env.example @@ -13,8 +13,8 @@ CI_ENVIRONMENT=development #-------------------------------------------------------------------- # Instance configuration #-------------------------------------------------------------------- -app.baseURL="https://__DOMAIN__/" -media.baseURL="https://__DOMAIN__/" +app.baseURL="https://__DOMAIN__" +media.baseURL="https://__DOMAIN__" admin.gateway="cp-admin" auth.gateway="cp-auth" From 58a71b9d96a2549da4d9aff423897337811391d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 16 Jul 2023 18:50:55 +0200 Subject: [PATCH 22/45] Update .env.example --- conf/.env.example | 2 ++ 1 file changed, 2 insertions(+) diff --git a/conf/.env.example b/conf/.env.example index 2001a07..5a0b7a6 100644 --- a/conf/.env.example +++ b/conf/.env.example @@ -9,7 +9,9 @@ # - replace all the default settings with your values # - go to `/cp-install` to complete installation #-------------------------------------------------------------------- + CI_ENVIRONMENT=development + #-------------------------------------------------------------------- # Instance configuration #-------------------------------------------------------------------- From 0bd09b3ce38d65de360bda5a9c9001f1554104b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 20 Jul 2023 23:09:33 +0200 Subject: [PATCH 23/45] Update manifest.toml --- manifest.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index 21e90bd..4f91f8d 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.4.6~ynh1" +version = "1.4.7~ynh1" maintainers = ["eric_G"] @@ -44,8 +44,8 @@ ram.runtime = "50M" [resources.sources] [resources.sources.main] - url = "https://code.castopod.org/adaures/castopod/uploads/848012e14d67cfee058c6085e4dfa6a3/castopod-1.4.6.zip" - sha256 = "7738818ef3fa43914087033b71c835366d7ad398985733506fc0e77fb075d0be" + url = "https://code.castopod.org/adaures/castopod/uploads/eec8c65b42e1019b0a34c345593f347d/castopod-1.4.7.zip" + sha256 = "f2deab3fc6c209792c81348dded985d6e1b9f8e23e2d6ca9bad3b144262e8905" in_subdir = true [resources.system_user] From 46c1fea3cde590c450918f30267f3e2956f96ee5 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 20 Jul 2023 21:09:38 +0000 Subject: [PATCH 24/45] 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 37f902c..26d5520 100755 --- a/README.md +++ b/README.md @@ -31,7 +31,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.4.6~ynh1 +**Shipped version:** 1.4.7~ynh1 **Demo:** https://podcast.podlibre.org/@podlibre_fr diff --git a/README_fr.md b/README_fr.md index 9983a89..5e38ca4 100755 --- a/README_fr.md +++ b/README_fr.md @@ -30,7 +30,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.4.6~ynh1 +**Version incluse :** 1.4.7~ynh1 **Démo :** https://podcast.podlibre.org/@podlibre_fr From 7e187b23bedbc0a816202ace0dc2458858cab9c3 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Wed, 23 Aug 2023 22:49:54 +0200 Subject: [PATCH 25/45] Update manifest.toml --- manifest.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index 4f91f8d..6fca39b 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.4.7~ynh1" +version = "1.5.2~ynh1" maintainers = ["eric_G"] @@ -44,8 +44,8 @@ ram.runtime = "50M" [resources.sources] [resources.sources.main] - url = "https://code.castopod.org/adaures/castopod/uploads/eec8c65b42e1019b0a34c345593f347d/castopod-1.4.7.zip" - sha256 = "f2deab3fc6c209792c81348dded985d6e1b9f8e23e2d6ca9bad3b144262e8905" + url = "https://code.castopod.org/adaures/castopod/uploads/309ce6f60c1b0f2696bc493042c23821/castopod-1.5.2.zip" + sha256 = "b0ac2f7b36d9ccaca29367b1b40c4fa69d141ff2831d1c6e61d70bbfe8cf1405" in_subdir = true [resources.system_user] From f226da9d461d3ad26bb266313483094719e7f87b Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 23 Aug 2023 20:49:59 +0000 Subject: [PATCH 26/45] 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 26d5520..2fde5cb 100755 --- a/README.md +++ b/README.md @@ -31,7 +31,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.4.7~ynh1 +**Shipped version:** 1.5.2~ynh1 **Demo:** https://podcast.podlibre.org/@podlibre_fr diff --git a/README_fr.md b/README_fr.md index 5e38ca4..c14b05e 100755 --- a/README_fr.md +++ b/README_fr.md @@ -30,7 +30,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.4.7~ynh1 +**Version incluse :** 1.5.2~ynh1 **Démo :** https://podcast.podlibre.org/@podlibre_fr From eaa72aaa954c6b0b8c493b07219b74f8b41854ec Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Wed, 23 Aug 2023 22:57:07 +0200 Subject: [PATCH 27/45] fix --- conf/v1.5.2.sql | 14 ++++++++++++++ scripts/upgrade | 6 +++++- 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 conf/v1.5.2.sql diff --git a/conf/v1.5.2.sql b/conf/v1.5.2.sql new file mode 100644 index 0000000..6a2803a --- /dev/null +++ b/conf/v1.5.2.sql @@ -0,0 +1,14 @@ +-- change Twitter to X +INSERT INTO `cp_platforms` (`slug`, `type`, `label`, `home_url`, `submit_url`) VALUES +('x', 'social', 'X', 'https://x.com/', 'https://x.com/i/flow/signup'); + +UPDATE `cp_podcasts_platforms` +SET `platform_slug` = 'x' +WHERE `platform_slug` = 'twitter'; + +DELETE FROM `cp_platforms` WHERE `slug` = 'twitter'; + +-- add buymeacoffee and kofi as funding platforms +INSERT INTO `cp_platforms` (`slug`, `type`, `label`, `home_url`, `submit_url`) VALUES +('buymeacoffee', 'funding', 'Buy Me a Coffee', 'https://www.buymeacoffee.com/', 'https://www.buymeacoffee.com/signup'), +('kofi', 'funding', 'Ko-fi', 'https://ko-fi.com/', 'https://ko-fi.com/account/register'); diff --git a/scripts/upgrade b/scripts/upgrade index 17e52ec..7402b5b 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -75,7 +75,11 @@ chmod 644 "/etc/cron.d/$app" #================================================= # CONFIGURE CASTOPOD #================================================= -# ynh_script_progression --message="Configuring Castopod..." --weight=1 +ynh_script_progression --message="Configuring Castopod database..." --weight=1 + +ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < v1.5.2.sql + +#ynh_script_progression --message="Configuring Castopod..." --weight=1 # ynh_add_config --template="../conf/.env.example" --destination="$install_dir/.env" # chmod 600 $install_dir/.env From d0d7072ac06b8c4c2b0179843607d0fa996dbb52 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Wed, 23 Aug 2023 22:58:55 +0200 Subject: [PATCH 28/45] fix --- scripts/remove | 4 ---- scripts/upgrade | 4 ++-- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/scripts/remove b/scripts/remove index e101710..39d1cc8 100755 --- a/scripts/remove +++ b/scripts/remove @@ -29,10 +29,6 @@ ynh_remove_nginx_config # Remove the dedicated PHP-FPM config ynh_remove_fpm_config -#================================================= -# REMOVE VARIOUS FILES -#================================================= - # Remove a cron file ynh_secure_remove --file="/etc/cron.d/$app" diff --git a/scripts/upgrade b/scripts/upgrade index 7402b5b..0fe442e 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -63,7 +63,7 @@ chown -R $app:www-data "$install_dir" ynh_script_progression --message="Updating a configuration file..." --weight=1 # Create a dedicated PHP-FPM config -ynh_add_fpm_config --phpversion=$phpversion --usage=$fpm_usage --footprint=$fpm_footprint +ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint # Create a dedicated NGINX config ynh_add_nginx_config @@ -77,7 +77,7 @@ chmod 644 "/etc/cron.d/$app" #================================================= ynh_script_progression --message="Configuring Castopod database..." --weight=1 -ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < v1.5.2.sql +ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < "../conf/v1.5.2.sql" #ynh_script_progression --message="Configuring Castopod..." --weight=1 From 631f06e1236293b971baade8ffe651cc1b7d062e Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Wed, 23 Aug 2023 23:01:11 +0200 Subject: [PATCH 29/45] cleaning --- check_process | 27 --------------------------- manifest.toml | 7 +------ 2 files changed, 1 insertion(+), 33 deletions(-) delete mode 100755 check_process diff --git a/check_process b/check_process deleted file mode 100755 index cd87891..0000000 --- a/check_process +++ /dev/null @@ -1,27 +0,0 @@ -;; Test complet - ; Manifest - domain="domain.tld" - path="/path" - is_public=1 - admin="john" - password="strongpassword" - ; Checks - pkg_linter=1 - setup_sub_dir=0 - setup_root=1 - setup_nourl=0 - setup_private=1 - setup_public=1 - upgrade=1 - #1.0.0 alpha.80 - #upgrade=1 from_commit=074aac0f8caa4597bdc34c0e9355cf898546f0df - backup_restore=1 - multi_instance=1 - change_url=1 -;;; Options -Email= -Notification=none -;;; Upgrade options - ; commit=074aac0f8caa4597bdc34c0e9355cf898546f0df - name=1.0.0 alpha.80 - manifest_arg=domain=DOMAIN&path=PATH&admin=USER&language=fr&is_public=1&password=pass& diff --git a/manifest.toml b/manifest.toml index 6fca39b..cdf6dab 100644 --- a/manifest.toml +++ b/manifest.toml @@ -17,7 +17,7 @@ admindoc = "https://docs.castopod.org/" code = "https://code.castopod.org/adaures/castopod" [integration] -yunohost = ">= 11.1.21" +yunohost = ">= 11.2" architectures = "all" multi_instance = true ldap = false @@ -28,14 +28,9 @@ ram.runtime = "50M" [install] [install.domain] - help.en = "Castopod needs to be installed in a dedicated domain or sub-domain." - help.fr = "Castopod doit être installé dans un domaine ou sous-domaine dédié." type = "domain" - full_domain = true [install.init_main_permission] - help.en = "If enabled, Castopod will be accessible by people who do not have an account. This can be changed later via the webadmin." - help.fr = "Si cette case est cochée, Castopod sera accessible aux personnes n’ayant pas de compte. Vous pourrez changer ceci plus tard via la webadmin." type = "group" default = "visitors" From 89f387c31b863d1fcebed6fb2c044e08fc528647 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 26 Sep 2023 18:27:40 +0200 Subject: [PATCH 30/45] Update manifest.toml --- manifest.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index cdf6dab..035f850 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.5.2~ynh1" +version = "1.6.3~ynh1" maintainers = ["eric_G"] @@ -39,8 +39,8 @@ ram.runtime = "50M" [resources.sources] [resources.sources.main] - url = "https://code.castopod.org/adaures/castopod/uploads/309ce6f60c1b0f2696bc493042c23821/castopod-1.5.2.zip" - sha256 = "b0ac2f7b36d9ccaca29367b1b40c4fa69d141ff2831d1c6e61d70bbfe8cf1405" + url = "https://code.castopod.org/adaures/castopod/uploads/a4edf34191a695ecf414fb24c2f5ff9d/castopod-1.6.4.zip" + sha256 = "96e135184b71846beaa0943b54f0a62c952e5e62c5f6f263230f12f70fcb3908" in_subdir = true [resources.system_user] From 17e235827e677f2d6035e44111039c8884c1f067 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 26 Sep 2023 16:27:44 +0000 Subject: [PATCH 31/45] 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 2fde5cb..c3c8a1a 100755 --- a/README.md +++ b/README.md @@ -31,7 +31,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.5.2~ynh1 +**Shipped version:** 1.6.3~ynh1 **Demo:** https://podcast.podlibre.org/@podlibre_fr diff --git a/README_fr.md b/README_fr.md index c14b05e..3578e9f 100755 --- a/README_fr.md +++ b/README_fr.md @@ -30,7 +30,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.5.2~ynh1 +**Version incluse :** 1.6.3~ynh1 **Démo :** https://podcast.podlibre.org/@podlibre_fr From c2e5d570b63ade27c6f495e4f2d3ff2eca88092f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 26 Sep 2023 18:28:52 +0200 Subject: [PATCH 32/45] Update manifest.toml --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 035f850..ea446dc 100644 --- a/manifest.toml +++ b/manifest.toml @@ -51,7 +51,7 @@ ram.runtime = "50M" main.url = "/" [resources.apt] - packages = "mariadb-server ffmpeg php8.1-fpm php8.1-gd php8.1-intl php8.1-curl php8.1-exif php8.1-mbstring php8.1-xml php8.1-mysqlnd" + packages = "mariadb-server, ffmpeg, php8.1-fpm, php8.1-gd, php8.1-intl, php8.1-curl, php8.1-exif, php8.1-mbstring, php8.1-xml, php8.1-mysqlnd" [resources.database] type = "mysql" From bb80bbbd9bd87e1c057e2e21f52bfbf9bfec3107 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 1 Oct 2023 19:06:53 +0200 Subject: [PATCH 33/45] cleaning --- manifest.toml | 2 +- scripts/install | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index ea446dc..ff4ec2a 100644 --- a/manifest.toml +++ b/manifest.toml @@ -51,7 +51,7 @@ ram.runtime = "50M" main.url = "/" [resources.apt] - packages = "mariadb-server, ffmpeg, php8.1-fpm, php8.1-gd, php8.1-intl, php8.1-curl, php8.1-exif, php8.1-mbstring, php8.1-xml, php8.1-mysqlnd" + packages = "mariadb-server, ffmpeg, php8.2-gd, php8.2-intl, php8.2-curl, php8.2-exif, php8.2-mbstring, php8.2-xml, php8.2-mysqlnd" [resources.database] type = "mysql" diff --git a/scripts/install b/scripts/install index 292a52a..a688986 100755 --- a/scripts/install +++ b/scripts/install @@ -60,6 +60,7 @@ ynh_app_setting_set --app="$app" --key=redis_db --value="$redis_db" #redis_number=$(( $YNH_APP_INSTANCE_NUMBER - 1 )) ynh_add_config --template="../conf/.env.example" --destination="$install_dir/.env" + chmod 600 $install_dir/.env chown $app:www-data "$install_dir/.env" From 159e888fcc6720e80f1324499e97a8878d3f368a Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 1 Oct 2023 17:06:59 +0000 Subject: [PATCH 34/45] Auto-update README --- README.md | 1 - README_fr.md | 1 - 2 files changed, 2 deletions(-) diff --git a/README.md b/README.md index c3c8a1a..460e53f 100755 --- a/README.md +++ b/README.md @@ -44,7 +44,6 @@ Castopod is easy to install and was built on top of CodeIgniter4, a powerful PHP * Official app website: * Official admin documentation: * Upstream app code repository: -* YunoHost documentation for this app: * Report a bug: ## Developer info diff --git a/README_fr.md b/README_fr.md index 3578e9f..322daa9 100755 --- a/README_fr.md +++ b/README_fr.md @@ -43,7 +43,6 @@ Castopod est une plate-forme d'hébergement gratuite et open source conçue pour * Site officiel de l’app : * Documentation officielle de l’admin : * Dépôt de code officiel de l’app : -* Documentation YunoHost pour cette app : * Signaler un bug : ## Informations pour les développeurs From 4aae93a7f5ffc74be30be4278dd80dd0463bddc2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 12 Oct 2023 16:43:35 +0200 Subject: [PATCH 35/45] Update manifest.toml --- manifest.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index ff4ec2a..984c6a6 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.6.3~ynh1" +version = "1.6.5~ynh1" maintainers = ["eric_G"] @@ -39,8 +39,8 @@ ram.runtime = "50M" [resources.sources] [resources.sources.main] - url = "https://code.castopod.org/adaures/castopod/uploads/a4edf34191a695ecf414fb24c2f5ff9d/castopod-1.6.4.zip" - sha256 = "96e135184b71846beaa0943b54f0a62c952e5e62c5f6f263230f12f70fcb3908" + url = "https://code.castopod.org/adaures/castopod/uploads/fe7be588c53a9e1ed63af47e6e624ad1/castopod-1.6.5.zip" + sha256 = "3618afa82605dda4f791efe5bb312d1fab3c4b0d702086f9cb75e57d627b6306" in_subdir = true [resources.system_user] From 8e81f488a968336fe70a86ea9a151ed80b84c3d1 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 12 Oct 2023 14:43:42 +0000 Subject: [PATCH 36/45] 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 460e53f..9722fa5 100755 --- a/README.md +++ b/README.md @@ -31,7 +31,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.6.3~ynh1 +**Shipped version:** 1.6.5~ynh1 **Demo:** https://podcast.podlibre.org/@podlibre_fr diff --git a/README_fr.md b/README_fr.md index 322daa9..ebe7dbc 100755 --- a/README_fr.md +++ b/README_fr.md @@ -30,7 +30,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.6.3~ynh1 +**Version incluse :** 1.6.5~ynh1 **Démo :** https://podcast.podlibre.org/@podlibre_fr From aa11e5a24e58716b0d5a0c18a1636bd43b1705c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 12 Oct 2023 17:47:30 +0200 Subject: [PATCH 37/45] cleaning --- conf/.env.example | 27 +++++++++++++++++++++------ manifest.toml | 6 ++++++ scripts/install | 1 + scripts/upgrade | 13 ++++++++----- 4 files changed, 36 insertions(+), 11 deletions(-) diff --git a/conf/.env.example b/conf/.env.example index 5a0b7a6..01bbb5e 100644 --- a/conf/.env.example +++ b/conf/.env.example @@ -20,6 +20,9 @@ media.baseURL="https://__DOMAIN__" admin.gateway="cp-admin" auth.gateway="cp-auth" +media.root="media" +media.storage="__DATA_DIR__" + #-------------------------------------------------------------------- # Database configuration #-------------------------------------------------------------------- @@ -32,12 +35,12 @@ database.default.DBPrefix="cp_" #-------------------------------------------------------------------- # Email configuration #-------------------------------------------------------------------- -# email.fromEmail="your_email_address" -# email.fromName="Castopod" -# email.SMTPHost="localhost" -# email.SMTPPort="25" -# email.SMTPUser="your_smtp_user" -# email.SMTPPass="your_smtp_password" +email.fromEmail="__EMAIL__" +email.fromName="Castopod" +email.SMTPHost="localhost" +email.SMTPPort="25" +email.SMTPUser="__APP__" +email.SMTPPass="__MAIL_PWD__" #-------------------------------------------------------------------- # Cache configuration (advanced) @@ -55,7 +58,19 @@ cache.redis.password=null cache.redis.port=6379 cache.redis.database=__REDIS_DB__ +#-------------------------------------------------------------------- +# S3 configuration +#-------------------------------------------------------------------- +# media.fileManager="s3" +# media.s3.endpoint="your_s3_host" +# media.s3.key="your_s3_key" +# media.s3.secret="your_s3_secret" +# media.s3.region="your_s3_region" + #-------------------------------------------------------------------- # REST API configuration #-------------------------------------------------------------------- # restapi.enabled=true +# restapi.basicAuthUsername=castopod +# restapi.basicAuthPassword=password +# restapi.basicAuth=true diff --git a/manifest.toml b/manifest.toml index 984c6a6..37029e0 100644 --- a/manifest.toml +++ b/manifest.toml @@ -34,6 +34,9 @@ ram.runtime = "50M" type = "group" default = "visitors" + [install.admin] + type = "user" + [resources] [resources.sources] @@ -44,9 +47,12 @@ ram.runtime = "50M" in_subdir = true [resources.system_user] + allow_email = true [resources.install_dir] + [resources.data_dir] + [resources.permissions] main.url = "/" diff --git a/scripts/install b/scripts/install index a688986..3fa7318 100755 --- a/scripts/install +++ b/scripts/install @@ -16,6 +16,7 @@ source /usr/share/yunohost/helpers fpm_footprint="low" fpm_free_footprint=0 fpm_usage="low" +email=$(ynh_user_get_info --username=$admin --key=mail) ynh_app_setting_set --app=$app --key=fpm_footprint --value=$fpm_footprint ynh_app_setting_set --app=$app --key=fpm_free_footprint --value=$fpm_free_footprint diff --git a/scripts/upgrade b/scripts/upgrade index 0fe442e..4ab944a 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -73,17 +73,20 @@ chown root: "/etc/cron.d/$app" chmod 644 "/etc/cron.d/$app" #================================================= -# CONFIGURE CASTOPOD +# CONFIGURE CASTOPOD DATABASE #================================================= ynh_script_progression --message="Configuring Castopod database..." --weight=1 ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < "../conf/v1.5.2.sql" -#ynh_script_progression --message="Configuring Castopod..." --weight=1 +#================================================= +# ADD CONFIGURE +#================================================= +ynh_script_progression --message="Configuring Castopod..." --weight=1 -# ynh_add_config --template="../conf/.env.example" --destination="$install_dir/.env" -# chmod 600 $install_dir/.env -# chown $app:www-data "$install_dir/.env" +ynh_add_config --template="../conf/.env.example" --destination="$install_dir/.env" +chmod 600 $install_dir/.env +chown $app:www-data "$install_dir/.env" #================================================= # END OF SCRIPT From 88bde65e083de8d14d84b47c0373f616bcdad90d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 12 Oct 2023 17:48:44 +0200 Subject: [PATCH 38/45] cleaning --- scripts/backup | 7 +++++++ scripts/restore | 10 ++++++++++ 2 files changed, 17 insertions(+) diff --git a/scripts/backup b/scripts/backup index 8af0451..602cb5e 100755 --- a/scripts/backup +++ b/scripts/backup @@ -20,6 +20,13 @@ ynh_print_info --message="Declaring files to be backed up..." ynh_backup --src_path="$install_dir" +#================================================= +# BACKUP THE DATA DIR +#================================================= + +# Only relevant if there is a "data_dir" resource for this app +ynh_backup --src_path="$data_dir" --is_big + #================================================= # BACKUP THE NGINX CONFIGURATION #================================================= diff --git a/scripts/restore b/scripts/restore index 6e0a9ef..32d510c 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 + +# (Same as for install dir) +chown -R $app:www-data "$data_dir" + #================================================= # RESTORE THE MYSQL DATABASE #================================================= From 9081fc0a4ebbea0ba4cf16d2784b32550f701177 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 23 Oct 2023 23:22:33 +0200 Subject: [PATCH 39/45] Update .env.example --- conf/.env.example | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/conf/.env.example b/conf/.env.example index 01bbb5e..7241731 100644 --- a/conf/.env.example +++ b/conf/.env.example @@ -10,8 +10,6 @@ # - go to `/cp-install` to complete installation #-------------------------------------------------------------------- -CI_ENVIRONMENT=development - #-------------------------------------------------------------------- # Instance configuration #-------------------------------------------------------------------- @@ -20,8 +18,8 @@ media.baseURL="https://__DOMAIN__" admin.gateway="cp-admin" auth.gateway="cp-auth" -media.root="media" -media.storage="__DATA_DIR__" +#media.root="media" +#media.storage="__DATA_DIR__" #-------------------------------------------------------------------- # Database configuration From bae364079d1d9aa49b1189722117ab8fdbf688c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 23 Oct 2023 23:23:58 +0200 Subject: [PATCH 40/45] cleaning --- conf/.env.example | 2 +- conf/v1.5.2.sql | 14 -------------- 2 files changed, 1 insertion(+), 15 deletions(-) delete mode 100644 conf/v1.5.2.sql diff --git a/conf/.env.example b/conf/.env.example index 7241731..3ea19df 100644 --- a/conf/.env.example +++ b/conf/.env.example @@ -33,7 +33,7 @@ database.default.DBPrefix="cp_" #-------------------------------------------------------------------- # Email configuration #-------------------------------------------------------------------- -email.fromEmail="__EMAIL__" +email.fromEmail="__APP__@__DOMAIN__" email.fromName="Castopod" email.SMTPHost="localhost" email.SMTPPort="25" diff --git a/conf/v1.5.2.sql b/conf/v1.5.2.sql deleted file mode 100644 index 6a2803a..0000000 --- a/conf/v1.5.2.sql +++ /dev/null @@ -1,14 +0,0 @@ --- change Twitter to X -INSERT INTO `cp_platforms` (`slug`, `type`, `label`, `home_url`, `submit_url`) VALUES -('x', 'social', 'X', 'https://x.com/', 'https://x.com/i/flow/signup'); - -UPDATE `cp_podcasts_platforms` -SET `platform_slug` = 'x' -WHERE `platform_slug` = 'twitter'; - -DELETE FROM `cp_platforms` WHERE `slug` = 'twitter'; - --- add buymeacoffee and kofi as funding platforms -INSERT INTO `cp_platforms` (`slug`, `type`, `label`, `home_url`, `submit_url`) VALUES -('buymeacoffee', 'funding', 'Buy Me a Coffee', 'https://www.buymeacoffee.com/', 'https://www.buymeacoffee.com/signup'), -('kofi', 'funding', 'Ko-fi', 'https://ko-fi.com/', 'https://ko-fi.com/account/register'); From f54c3d25911d0495057da1076c3e1692dd29b061 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 23 Oct 2023 23:28:31 +0200 Subject: [PATCH 41/45] cleaning --- conf/.env.example | 3 --- manifest.toml | 2 -- scripts/backup | 7 ------- scripts/install | 1 - scripts/remove | 7 ------- scripts/restore | 10 ---------- 6 files changed, 30 deletions(-) diff --git a/conf/.env.example b/conf/.env.example index 3ea19df..4e99c76 100644 --- a/conf/.env.example +++ b/conf/.env.example @@ -18,9 +18,6 @@ media.baseURL="https://__DOMAIN__" admin.gateway="cp-admin" auth.gateway="cp-auth" -#media.root="media" -#media.storage="__DATA_DIR__" - #-------------------------------------------------------------------- # Database configuration #-------------------------------------------------------------------- diff --git a/manifest.toml b/manifest.toml index 37029e0..06b3624 100644 --- a/manifest.toml +++ b/manifest.toml @@ -51,8 +51,6 @@ ram.runtime = "50M" [resources.install_dir] - [resources.data_dir] - [resources.permissions] main.url = "/" diff --git a/scripts/backup b/scripts/backup index 602cb5e..8af0451 100755 --- a/scripts/backup +++ b/scripts/backup @@ -20,13 +20,6 @@ ynh_print_info --message="Declaring files to be backed up..." ynh_backup --src_path="$install_dir" -#================================================= -# BACKUP THE DATA DIR -#================================================= - -# Only relevant if there is a "data_dir" resource for this app -ynh_backup --src_path="$data_dir" --is_big - #================================================= # BACKUP THE NGINX CONFIGURATION #================================================= diff --git a/scripts/install b/scripts/install index 3fa7318..a688986 100755 --- a/scripts/install +++ b/scripts/install @@ -16,7 +16,6 @@ source /usr/share/yunohost/helpers fpm_footprint="low" fpm_free_footprint=0 fpm_usage="low" -email=$(ynh_user_get_info --username=$admin --key=mail) ynh_app_setting_set --app=$app --key=fpm_footprint --value=$fpm_footprint ynh_app_setting_set --app=$app --key=fpm_free_footprint --value=$fpm_free_footprint diff --git a/scripts/remove b/scripts/remove index 39d1cc8..5de38ad 100755 --- a/scripts/remove +++ b/scripts/remove @@ -9,13 +9,6 @@ source _common.sh source /usr/share/yunohost/helpers -#================================================= -# LOAD SETTINGS -#================================================= -# ynh_script_progression --message="Loading installation settings..." --weight=1 - -# redis_db=$(ynh_app_setting_get --app=$app --key=redis_db) - #================================================= # REMOVE THE REDIS DATABASE #================================================= diff --git a/scripts/restore b/scripts/restore index 32d510c..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 - -# (Same as for install dir) -chown -R $app:www-data "$data_dir" - #================================================= # RESTORE THE MYSQL DATABASE #================================================= From bebba8ecfcaccf12f75bf3a71fdb139ee44adc8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 23 Oct 2023 23:30:46 +0200 Subject: [PATCH 42/45] Update upgrade --- scripts/upgrade | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 4ab944a..6471820 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -72,17 +72,10 @@ ynh_add_config --template="../conf/cron" --destination="/etc/cron.d/$app" chown root: "/etc/cron.d/$app" chmod 644 "/etc/cron.d/$app" -#================================================= -# CONFIGURE CASTOPOD DATABASE -#================================================= -ynh_script_progression --message="Configuring Castopod database..." --weight=1 - -ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < "../conf/v1.5.2.sql" - #================================================= # ADD CONFIGURE #================================================= -ynh_script_progression --message="Configuring Castopod..." --weight=1 +ynh_script_progression --message="Configuring $app..." --weight=1 ynh_add_config --template="../conf/.env.example" --destination="$install_dir/.env" chmod 600 $install_dir/.env From 968d650248335ff5fc7de9b09efcb9616ae59ee7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 23 Oct 2023 23:41:17 +0200 Subject: [PATCH 43/45] fix database --- scripts/install | 9 +++++++++ scripts/upgrade | 9 +++++++++ 2 files changed, 18 insertions(+) diff --git a/scripts/install b/scripts/install index a688986..b27e8a2 100755 --- a/scripts/install +++ b/scripts/install @@ -64,6 +64,15 @@ ynh_add_config --template="../conf/.env.example" --destination="$install_dir/.en chmod 600 $install_dir/.env chown $app:www-data "$install_dir/.env" +#================================================= +# RUN MIGRATIONS +#================================================= +ynh_script_progression --message="Configuring $app database..." --weight=1 + +pushd $install_dir + ynh_exec_warn_less ynh_exec_as php${phpversion} spark migrate --all +popd + #================================================= # END OF SCRIPT #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 6471820..1c0d283 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -81,6 +81,15 @@ ynh_add_config --template="../conf/.env.example" --destination="$install_dir/.en chmod 600 $install_dir/.env chown $app:www-data "$install_dir/.env" +#================================================= +# RUN MIGRATIONS +#================================================= +ynh_script_progression --message="Configuring $app database..." --weight=1 + +pushd $install_dir + ynh_exec_warn_less ynh_exec_as php${phpversion} spark migrate --all +popd + #================================================= # END OF SCRIPT #================================================= From 2b15a2537c8dc4faac1b5b68965eb1b6c4f113e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 23 Oct 2023 23:47:42 +0200 Subject: [PATCH 44/45] fix --- scripts/install | 2 +- scripts/upgrade | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/install b/scripts/install index b27e8a2..a5f7561 100755 --- a/scripts/install +++ b/scripts/install @@ -70,7 +70,7 @@ chown $app:www-data "$install_dir/.env" ynh_script_progression --message="Configuring $app database..." --weight=1 pushd $install_dir - ynh_exec_warn_less ynh_exec_as php${phpversion} spark migrate --all + ynh_exec_warn_less ynh_exec_as $app php${phpversion} spark migrate --all popd #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 1c0d283..59a95a5 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -87,7 +87,7 @@ chown $app:www-data "$install_dir/.env" ynh_script_progression --message="Configuring $app database..." --weight=1 pushd $install_dir - ynh_exec_warn_less ynh_exec_as php${phpversion} spark migrate --all + ynh_exec_warn_less ynh_exec_as $app php${phpversion} spark migrate --all popd #================================================= From 822755d3e9772d73892ee72ad5ea42487ba2a10f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 24 Oct 2023 00:05:02 +0200 Subject: [PATCH 45/45] Update manifest.toml --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 06b3624..930ab1a 100644 --- a/manifest.toml +++ b/manifest.toml @@ -23,7 +23,7 @@ multi_instance = true ldap = false sso = false disk = "50M" -ram.build = "100M" +ram.build = "150M" ram.runtime = "50M" [install]