From c50274de6ad8437effb5e0b59f99711e371e52ad Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 11 Sep 2021 10:29:27 +0200 Subject: [PATCH 1/5] remove redis install -> already part of YunoHost --- scripts/_common.sh | 2 -- scripts/install | 7 ------- scripts/remove | 8 -------- scripts/restore | 9 --------- scripts/upgrade | 7 ------- 5 files changed, 33 deletions(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index ed4ae6b..60ae74d 100755 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -8,8 +8,6 @@ YNH_PHP_VERSION="8.0" extra_php_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="redis-server redis-tools" - #================================================= # PERSONAL HELPERS #================================================= diff --git a/scripts/install b/scripts/install index c240925..ac247e1 100755 --- a/scripts/install +++ b/scripts/install @@ -57,13 +57,6 @@ ynh_script_progression --message="Configuring system user..." --weight=1 # Create a system user ynh_system_user_create --username=$app --home_dir=$final_path -#================================================= -# INSTALL DEPENDENCIES -#================================================= -ynh_script_progression --message="Installing dependencies..." --weight=1 - -ynh_install_app_dependencies $pkg_dependencies - #================================================= # CREATE A MYSQL DATABASE #================================================= diff --git a/scripts/remove b/scripts/remove index 8b467da..7b22d1d 100755 --- a/scripts/remove +++ b/scripts/remove @@ -37,14 +37,6 @@ ynh_script_progression --message="Removing the Redis database..." --weight=1 ynh_redis_remove_db "$redis_db" -#================================================= -# REMOVE DEPENDENCIES -#================================================= -ynh_script_progression --message="Removing dependencies..." --weight=1 - -# Remove metapackage and its dependencies -ynh_remove_app_dependencies - #================================================= # REMOVE APP MAIN DIR #================================================= diff --git a/scripts/restore b/scripts/restore index ba01d32..52378f1 100755 --- a/scripts/restore +++ b/scripts/restore @@ -75,18 +75,9 @@ chown -R $app:www-data "$final_path" #ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" - # Create a dedicated PHP-FPM config ynh_add_fpm_config --package="$extra_php_dependencies" -#================================================= -# REINSTALL DEPENDENCIES -#================================================= -ynh_script_progression --message="Reinstalling dependencies..." --weight=1 - -# Define and install dependencies -ynh_install_app_dependencies $pkg_dependencies - #================================================= # RESTORE THE MYSQL DATABASE #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index a54125c..c9350fb 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -102,13 +102,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 #================================================= From 52f8989fe54b024d25ed58076d28e0aaa9a42713 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 20 Sep 2021 22:27:30 +0200 Subject: [PATCH 2/5] 72 --- conf/app.src | 5 ++--- manifest.json | 11 ++++------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/conf/app.src b/conf/app.src index e11bffa..b850b19 100755 --- a/conf/app.src +++ b/conf/app.src @@ -1,7 +1,6 @@ -SOURCE_URL=https://code.podlibre.org/podlibre/castopod-host/uploads/d979ccf46d8426ccdbb838d460698f7d/castopod-host-1.0.0-alpha.70.zip -SOURCE_SUM=5628536dd692893a33ac09a1e46b90f59a9303f31bf0d2b42b15102ee2f51ef5 +SOURCE_URL=https://code.podlibre.org/podlibre/castopod-host/uploads/e41f0aae05da572c98237d1ddfc823ec/castopod-host-1.0.0-alpha.72.tar.gz +SOURCE_SUM=4f7b31ddfc4e34b6a2d4c7253151c5b91c1d4fc4a4a986e2a9d510edb6e37261 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=true -SOURCE_FILENAME= SOURCE_EXTRACT=true diff --git a/manifest.json b/manifest.json index 2b776b1..3e00182 100755 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Hosting platform made for podcasters", "fr": "Plateforme d'hébergement conçue pour les podcasteurs" }, - "version": "1.0.0-70~ynh1", + "version": "1.0.0-72~ynh1", "url": "https://podlibre.org/", "upstream": { "license": "GPL-3.0-only", @@ -37,13 +37,11 @@ "help": { "en": "Castopod needs to be installed in a dedicated domain or sub-domain.", "fr": "Castopod doit être installé dans un domaine ou sous-domaine dédié." - }, - "example": "podcast.example.com" + } }, { "name": "admin", - "type": "user", - "example": "johndoe" + "type": "user" }, { "name": "is_public", @@ -56,8 +54,7 @@ }, { "name": "password", - "type": "password", - "example": "Choose a password" + "type": "password" } ] } From 8d0963a3de6890ae53d6efaffad228a32442c762 Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Mon, 20 Sep 2021 20:27:37 +0000 Subject: [PATCH 3/5] 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 6b53f37..4b0b98e 100755 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Hosting platform made for podcasters -**Shipped version:** 1.0.0-70~ynh1 +**Shipped version:** 1.0.0-72~ynh1 **Demo:** https://podcast.podlibre.org/@podlibre_fr diff --git a/README_fr.md b/README_fr.md index f1b0294..ee1ce2f 100755 --- a/README_fr.md +++ b/README_fr.md @@ -13,7 +13,7 @@ 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-70~ynh1 +**Version incluse :** 1.0.0-72~ynh1 **Démo :** https://podcast.podlibre.org/@podlibre_fr From 6ca3480b623fe0c55e075c1b34bf4f84c7ac6bef Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 20 Sep 2021 22:28:25 +0200 Subject: [PATCH 4/5] Update restore --- scripts/restore | 3 --- 1 file changed, 3 deletions(-) diff --git a/scripts/restore b/scripts/restore index 52378f1..bd7ca7b 100755 --- a/scripts/restore +++ b/scripts/restore @@ -14,9 +14,6 @@ source /usr/share/yunohost/helpers # MANAGE SCRIPT FAILURE #================================================= -ynh_clean_setup () { - true -} # Exit if an error occurs during the execution of the script ynh_abort_if_errors From 54342c07da37b0d32840049b2b90e06153d8dcd0 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 20 Sep 2021 22:44:37 +0200 Subject: [PATCH 5/5] Update app.src --- conf/app.src | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/app.src b/conf/app.src index b850b19..f64a968 100755 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://code.podlibre.org/podlibre/castopod-host/uploads/e41f0aae05da572c98237d1ddfc823ec/castopod-host-1.0.0-alpha.72.tar.gz -SOURCE_SUM=4f7b31ddfc4e34b6a2d4c7253151c5b91c1d4fc4a4a986e2a9d510edb6e37261 +SOURCE_URL=https://code.podlibre.org/podlibre/castopod-host/uploads/738e79d4c97aa975a245ccd3dc8c9a95/castopod-host-1.0.0-alpha.72.zip +SOURCE_SUM=afb25e17f68b68190a73499a370de0f1ca8755dfed9e3b3482359ff3fd23b2fd SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=true