diff --git a/README.md b/README.md index bdb2cc02..3e25f4df 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to ## Overview The federated image sharing service Pixelfed, for YunoHost -**Shipped version:** 0.10.8 +**Shipped version:** 0.10.9 ## Important points to read before installing diff --git a/conf/app.src b/conf/app.src index 9e7fd54f..e2ffb638 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/pixelfed/pixelfed/archive/v0.10.8.tar.gz -SOURCE_SUM=80ad527c20f5df75a5dfa9e31b8045d2e926db31ebf85ec9f6ccb0c33df240ca +SOURCE_URL=https://github.com/pixelfed/pixelfed/archive/v0.10.9.tar.gz +SOURCE_SUM=d843796473858de2f0f3cda11db2f711b8303a058660d62c6696d4cb828a8a45 OURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index 4f832e54..6c543005 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "ActivityPub Federated Image Sharing", "fr": "Logiciel de partage d'image fédéré via ActivityPub" }, - "version": "0.10.8~ynh1", + "version": "0.10.9~ynh1", "url": "https://pixelfed.org/", "license": "AGPL-3.0-or-later", "maintainer": [ @@ -16,6 +16,9 @@ }, { "name": "yalh76" + }, + { + "name": "lapineige" } ], "requirements": { diff --git a/scripts/_common.sh b/scripts/_common.sh index 4e3718f7..14ee509d 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -34,6 +34,7 @@ ynh_composer_exec () { # Manage arguments with getopts ynh_handle_getopts_args "$@" workdir="${workdir:-$final_path}" + phpversion="${phpversion:-7.0}" COMPOSER_HOME="$workdir/.composer" \ php${phpversion} "$workdir/composer.phar" $commands \ @@ -53,6 +54,7 @@ ynh_install_composer () { # Manage arguments with getopts ynh_handle_getopts_args "$@" workdir="${workdir:-$final_path}" + phpversion="${phpversion:-7.0}" curl -sS https://getcomposer.org/installer \ | COMPOSER_HOME="$workdir/.composer" \ @@ -64,7 +66,6 @@ ynh_install_composer () { || ynh_die --message="Unable to update core dependencies with Composer." } - # Install another version of php. # # usage: ynh_install_php --phpversion=phpversion [--package=packages] diff --git a/scripts/remove b/scripts/remove index cced37cf..2615b5d0 100644 --- a/scripts/remove +++ b/scripts/remove @@ -86,14 +86,6 @@ ynh_print_info --message="Removing php-fpm configuration..." # Remove the dedicated php-fpm config ynh_remove_fpm_config -#================================================= -# RESTART PHP-FPM 7.0 FPM -#================================================= -ynh_print_info --message="Start php7.0-fpm..." - -#Sometimes with package_check php7.0-fpm fail to reload and stop. So starting the service, just in case. -ynh_systemd_action --service_name=php7.0-fpm --action="start" - #================================================= # GENERIC FINALIZATION #=================================================