diff --git a/README.md b/README.md
index 9b2a7ca..9722fa5 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
@@ -32,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.1.2~ynh2
+**Shipped version:** 1.6.5~ynh1
**Demo:** https://podcast.podlibre.org/@podlibre_fr
@@ -45,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 9b3f0e8..ebe7dbc 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
@@ -31,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.1.2~ynh2
+**Version incluse :** 1.6.5~ynh1
**Démo :** https://podcast.podlibre.org/@podlibre_fr
@@ -44,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
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/conf/.env.example b/conf/.env.example
index bf496f9..4e99c76 100644
--- a/conf/.env.example
+++ b/conf/.env.example
@@ -30,12 +30,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="__APP__@__DOMAIN__"
+email.fromName="Castopod"
+email.SMTPHost="localhost"
+email.SMTPPort="25"
+email.SMTPUser="__APP__"
+email.SMTPPass="__MAIL_PWD__"
#--------------------------------------------------------------------
# Cache configuration (advanced)
@@ -53,7 +53,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/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/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/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/manifest.toml b/manifest.toml
index 0816022..930ab1a 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.6.5~ynh1"
maintainers = ["eric_G"]
@@ -17,30 +17,37 @@ admindoc = "https://docs.castopod.org/"
code = "https://code.castopod.org/adaures/castopod"
[integration]
-yunohost = ">= 11.1.13"
+yunohost = ">= 11.2"
architectures = "all"
multi_instance = true
ldap = false
sso = false
disk = "50M"
-ram.build = "100M"
+ram.build = "150M"
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"
+ [install.admin]
+ type = "user"
+
[resources]
+
+ [resources.sources]
+
+ [resources.sources.main]
+ url = "https://code.castopod.org/adaures/castopod/uploads/fe7be588c53a9e1ed63af47e6e624ad1/castopod-1.6.5.zip"
+ sha256 = "3618afa82605dda4f791efe5bb312d1fab3c4b0d702086f9cb75e57d627b6306"
+ in_subdir = true
+
[resources.system_user]
+ allow_email = true
[resources.install_dir]
@@ -48,7 +55,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, 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 58de286..a5f7561 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
@@ -57,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)
@@ -65,9 +60,19 @@ 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"
+#=================================================
+# RUN MIGRATIONS
+#=================================================
+ynh_script_progression --message="Configuring $app database..." --weight=1
+
+pushd $install_dir
+ ynh_exec_warn_less ynh_exec_as $app php${phpversion} spark migrate --all
+popd
+
#=================================================
# END OF SCRIPT
#=================================================
diff --git a/scripts/remove b/scripts/remove
index e101710..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
#=================================================
@@ -29,10 +22,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 17e52ec..59a95a5 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
@@ -73,13 +73,22 @@ chown root: "/etc/cron.d/$app"
chmod 644 "/etc/cron.d/$app"
#=================================================
-# CONFIGURE CASTOPOD
+# 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
-# 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"
+
+#=================================================
+# RUN MIGRATIONS
+#=================================================
+ynh_script_progression --message="Configuring $app database..." --weight=1
+
+pushd $install_dir
+ ynh_exec_warn_less ynh_exec_as $app php${phpversion} spark migrate --all
+popd
#=================================================
# END OF SCRIPT