diff --git a/README.md b/README.md index 8ba207e..d72abe7 100755 --- a/README.md +++ b/README.md @@ -17,13 +17,13 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Hosting platform made for podcasters -**Shipped version:** 1.0.0-80~ynh1 +**Shipped version:** 1.0.0-88~ynh1 **Demo:** https://podcast.podlibre.org/@podlibre_fr ## Screenshots -![](./doc/screenshots/activity-feed.png) +![](./doc/screenshots/screenshot.png) ## Disclaimers / important information @@ -42,7 +42,7 @@ Hosting platform made for podcasters ## Documentation and resources -* Official app website: https://podlibre.org/ +* Official app website: https://castopod.org/ * Official admin documentation: https://podlibre.org/create-a-podcast-in-3mn-with-castopod/ * Upstream app code repository: https://code.podlibre.org/podlibre/castopod-host * YunoHost documentation for this app: https://yunohost.org/app_castopod diff --git a/README_fr.md b/README_fr.md index 6eb5047..8ed2d55 100755 --- a/README_fr.md +++ b/README_fr.md @@ -13,13 +13,13 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour Plateforme d'hébergement conçue pour les podcasteurs -**Version incluse :** 1.0.0-80~ynh1 +**Version incluse :** 1.0.0-88~ynh1 **Démo :** https://podcast.podlibre.org/@podlibre_fr ## Captures d'écran -![](./doc/screenshots/activity-feed.png) +![](./doc/screenshots/screenshot.png) ## Avertissements / informations importantes @@ -38,7 +38,7 @@ Plateforme d'hébergement conçue pour les podcasteurs ## Documentations et ressources -* Site officiel de l'app : https://podlibre.org/ +* Site officiel de l'app : https://castopod.org/ * Documentation officielle de l'admin : https://podlibre.org/create-a-podcast-in-3mn-with-castopod/ * Dépôt de code officiel de l'app : https://code.podlibre.org/podlibre/castopod-host * Documentation YunoHost pour cette app : https://yunohost.org/app_castopod diff --git a/check_process b/check_process index a1f6cf8..27cc6f1 100755 --- a/check_process +++ b/check_process @@ -13,8 +13,8 @@ setup_private=1 setup_public=1 upgrade=1 - #1.0.0 alpha.75 - upgrade=1 from_commit=c8a5545d2b1d61342d837b7608fdc64a5b71b25b + #1.0.0 alpha.80 + upgrade=1 from_commit=074aac0f8caa4597bdc34c0e9355cf898546f0df backup_restore=1 multi_instance=1 change_url=1 @@ -22,6 +22,6 @@ Email= Notification=none ;;; Upgrade options - ; commit=c8a5545d2b1d61342d837b7608fdc64a5b71b25b - name=1.0.0 alpha.75 + ; 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 6ccd22f..cfed94a 100644 --- a/conf/.env.example +++ b/conf/.env.example @@ -15,8 +15,8 @@ #-------------------------------------------------------------------- app.baseURL="https://__DOMAIN__" app.mediaBaseURL="https://__DOMAIN__" -app.adminGateway="cp-admin" -app.authGateway="cp-auth" +admin.gateway="cp-admin" +auth.gateway="cp-auth" #-------------------------------------------------------------------- # Database configuration diff --git a/conf/app.src b/conf/app.src index 6143471..dceb938 100755 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://code.podlibre.org/podlibre/castopod-host/uploads/0ee7cea7e68cd518c373372edfdd5d9f/castopod-host-1.0.0-alpha.80.zip -SOURCE_SUM=30cab549e230bcd57f93df392ecff5fa8daa6545aa855195b280eed48150e43d +SOURCE_URL=https://code.podlibre.org/podlibre/castopod-host/uploads/480a03db991976b229ae7bedfc990999/castopod-host-1.0.0-beta.8.zip +SOURCE_SUM=55150151353d10073e8d04513403d5b8e9ba87b59d1041199127590322453b75 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=true diff --git a/conf/cron b/conf/cron index 7c7de7c..935daa6 100644 --- a/conf/cron +++ b/conf/cron @@ -1 +1,2 @@ -* * * * * __USER__ /usr/bin/php__PHPVERSION__ __FINALPATH__/public/index.php scheduled-activities \ No newline at end of file +* * * * * __USER__ /usr/bin/php__PHPVERSION__ __FINALPATH__/public/index.php scheduled-activities +* * * * * __USER__ /usr/bin/php__PHPVERSION__ __FINALPATH__/public/index.php scheduled-video-clips \ No newline at end of file diff --git a/doc/screenshots/activity-feed.png b/doc/screenshots/activity-feed.png deleted file mode 100644 index 3e098a4..0000000 Binary files a/doc/screenshots/activity-feed.png and /dev/null differ diff --git a/doc/screenshots/screenshot.png b/doc/screenshots/screenshot.png new file mode 100644 index 0000000..5884b5f Binary files /dev/null and b/doc/screenshots/screenshot.png differ diff --git a/manifest.json b/manifest.json index 995befb..7005323 100755 --- a/manifest.json +++ b/manifest.json @@ -6,11 +6,11 @@ "en": "Hosting platform made for podcasters", "fr": "Plateforme d'hébergement conçue pour les podcasteurs" }, - "version": "1.0.0-80~ynh1", - "url": "https://podlibre.org/", + "version": "1.0.0-88~ynh1", + "url": "https://castopod.org/", "upstream": { "license": "GPL-3.0-only", - "website": "https://podlibre.org/", + "website": "https://castopod.org/", "demo": "https://podcast.podlibre.org/@podlibre_fr", "admindoc": "https://podlibre.org/create-a-podcast-in-3mn-with-castopod/", "code": "https://code.podlibre.org/podlibre/castopod-host" diff --git a/scripts/_common.sh b/scripts/_common.sh index 9d4db91..f28995d 100755 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -6,7 +6,7 @@ YNH_PHP_VERSION="8.0" -pkg_dependencies="php${YNH_PHP_VERSION}-mysql php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-intl php${YNH_PHP_VERSION}-curl php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-json php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-mysqlnd" +pkg_dependencies="ffmpeg php${YNH_PHP_VERSION}-mysql php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-intl php${YNH_PHP_VERSION}-curl php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-json php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-mysqlnd" #================================================= # PERSONAL HELPERS diff --git a/scripts/conf b/scripts/conf index 3440bd2..8a9110c 100644 --- a/scripts/conf +++ b/scripts/conf @@ -57,7 +57,7 @@ set__fpm_footprint() { } set__free_footprint() { - if [ "$fpm_footprint" = "specific" ] + if [ "$fpm_footprint" == "specific" ] then ynh_app_setting_set --app=$app --key=fpm_footprint --value="$free_footprint" fi @@ -72,7 +72,7 @@ ynh_app_config_validate() { if [ "${changed[fpm_usage]}" == "true" ] || [ "${changed[fpm_footprint]}" == "true" ] || [ "${changed[free_footprint]}" == "true" ]; then # If fpm_footprint is set to 'specific', use $free_footprint value. - if [ "$fpm_footprint" = "specific" ] + if [ "$fpm_footprint" == "specific" ] then fpm_footprint=$free_footprint fi diff --git a/scripts/install b/scripts/install index cc192a7..344f4a1 100755 --- a/scripts/install +++ b/scripts/install @@ -24,7 +24,7 @@ domain=$YNH_APP_ARG_DOMAIN path_url="/" is_public=$YNH_APP_ARG_IS_PUBLIC admin=$YNH_APP_ARG_ADMIN -password=$YNH_APP_ARG_PASSWORD +password="$YNH_APP_ARG_PASSWORD" email=$(ynh_user_get_info --username=$admin --key=mail) phpversion=$YNH_PHP_VERSION @@ -50,6 +50,7 @@ ynh_app_setting_set --app=$app --key=domain --value=$domain ynh_app_setting_set --app=$app --key=path --value=$path_url ynh_app_setting_set --app=$app --key=admin --value=$admin ynh_app_setting_set --app=$app --key=phpversion --value=$phpversion +ynh_app_setting_set --app=$app --key=password --value="$password" #================================================= # INSTALL DEPENDENCIES diff --git a/scripts/remove b/scripts/remove index d2d7fa7..207e1b3 100755 --- a/scripts/remove +++ b/scripts/remove @@ -30,14 +30,6 @@ ynh_script_progression --message="Removing the MySQL database..." --weight=1 # Remove a database if it exists, along with the associated user ynh_mysql_remove_db --db_user=$db_user --db_name=$db_name -#================================================= -# REMOVE DEPENDENCIES -#================================================= -ynh_script_progression --message="Removing dependencies..." --weight=1 - -# Remove metapackage and its dependencies -ynh_remove_app_dependencies - #================================================= # REMOVE THE REDIS DATABASE #================================================= @@ -69,6 +61,14 @@ ynh_script_progression --message="Removing PHP-FPM configuration..." --weight=2 # Remove the dedicated PHP-FPM config ynh_remove_fpm_config +#================================================= +# REMOVE DEPENDENCIES +#================================================= +ynh_script_progression --message="Removing dependencies..." --weight=1 + +# Remove metapackage and its dependencies +ynh_remove_app_dependencies + #================================================= # REMOVE VARIOUS FILES #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 3a39c19..67df1cf 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -83,6 +83,13 @@ if ynh_legacy_permissions_exists; then ynh_app_setting_delete --app=$app --key=is_public fi +#================================================= +# UPGRADE DEPENDENCIES +#================================================= +ynh_script_progression --message="Upgrading dependencies..." --weight=1 + +ynh_install_app_dependencies $pkg_dependencies + #================================================= # CREATE DEDICATED USER #================================================= @@ -102,7 +109,7 @@ then ynh_secure_remove --file="$final_path/app" ynh_secure_remove --file="$final_path/public/assets" # Download, check integrity, uncompress and patch the source from app.src - ynh_setup_source --dest_dir="$final_path" + ynh_setup_source --dest_dir="$final_path" --keep="$final_path/.env" fi chmod 750 "$final_path" @@ -117,13 +124,6 @@ ynh_script_progression --message="Upgrading NGINX web server configuration..." - # Create a dedicated NGINX config ynh_add_nginx_config -#================================================= -# UPGRADE DEPENDENCIES -#================================================= -ynh_script_progression --message="Upgrading dependencies..." --weight=1 - -ynh_install_app_dependencies $pkg_dependencies - #================================================= # PHP-FPM CONFIGURATION #================================================= @@ -135,11 +135,11 @@ ynh_add_fpm_config --phpversion=$phpversion --usage=$fpm_usage --footprint=$fpm_ #================================================= # CONFIGURE CASTOPOD #================================================= -ynh_script_progression --message="Configuring Castopod..." --weight=1 +# ynh_script_progression --message="Configuring Castopod..." --weight=1 -ynh_add_config --template="../conf/.env.example" --destination="$final_path/.env" -chmod 600 $final_path/.env -chown $app:www-data "$final_path/.env" +# ynh_add_config --template="../conf/.env.example" --destination="$final_path/.env" +# chmod 600 $final_path/.env +# chown $app:www-data "$final_path/.env" #================================================= # SETUP CRON