From b3c3defc683a0603a0de0b6fb81ceef4c96d9f15 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Tue, 4 Jun 2019 02:06:38 +0200 Subject: [PATCH 1/5] Upgrade to 0.9.4 --- README.md | 2 +- conf/app.src | 4 ++-- manifest.json | 2 +- scripts/upgrade | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 23ecaa0b..30a324a5 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.9.0 +**Shipped version:** 0.9.4 ## Important points to read before installing diff --git a/conf/app.src b/conf/app.src index d492ccde..0e1d4d40 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/pixelfed/pixelfed/archive/v0.9.0.tar.gz -SOURCE_SUM=ea69f3441991c9122638b1476ba11ec1b7847fac569fa77a8ed7b03481b19d88 +SOURCE_URL=https://github.com/pixelfed/pixelfed/archive/v0.9.4.tar.gz +SOURCE_SUM=abb6bdf44035dcaa71cb2b5b85a76cb8f4ebca4cc390df5d66454046b8412766 OURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true \ No newline at end of file diff --git a/manifest.json b/manifest.json index 0b352997..d346990b 100644 --- a/manifest.json +++ b/manifest.json @@ -5,7 +5,7 @@ "description": { "en": "ActivityPub Federated Image Sharing" }, - "version": "0.9.0~ynh4", + "version": "0.9.4~ynh1", "url": "https://pixelfed.org/", "license": "AGPL-3.0-or-later", "maintainer": [ diff --git a/scripts/upgrade b/scripts/upgrade index 2fdafb35..83f99657 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -65,7 +65,7 @@ if [ -z "$app_key" ]; then ynh_app_setting_set --app="$app" --key=app_key --value="$app_key" fi -if dpkg --compare-versions "0.9.0~ynh3" gt "$(ynh_read_manifest --manifest="/etc/yunohost/apps/$YNH_APP_INSTANCE_NAME/manifest.json" --manifest_key="version" || echo 1.0)" ; then +if dpkg --compare-versions "0.9.4~ynh3" gt "$(ynh_read_manifest --manifest="/etc/yunohost/apps/$YNH_APP_INSTANCE_NAME/manifest.json" --manifest_key="version" || echo 1.0)" ; then ynh_add_systemd_config --service="${app}-horizon" --template=horizon.service fi From d0a452bd658c9c621218c475b3a7c45128ff7c10 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Tue, 4 Jun 2019 19:47:11 +0200 Subject: [PATCH 2/5] back to 0.9.0~ynh3 --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index 83f99657..2fdafb35 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -65,7 +65,7 @@ if [ -z "$app_key" ]; then ynh_app_setting_set --app="$app" --key=app_key --value="$app_key" fi -if dpkg --compare-versions "0.9.4~ynh3" gt "$(ynh_read_manifest --manifest="/etc/yunohost/apps/$YNH_APP_INSTANCE_NAME/manifest.json" --manifest_key="version" || echo 1.0)" ; then +if dpkg --compare-versions "0.9.0~ynh3" gt "$(ynh_read_manifest --manifest="/etc/yunohost/apps/$YNH_APP_INSTANCE_NAME/manifest.json" --manifest_key="version" || echo 1.0)" ; then ynh_add_systemd_config --service="${app}-horizon" --template=horizon.service fi From 68c76e7209139015c2b69e36e16985fb09a3182f Mon Sep 17 00:00:00 2001 From: yalh76 Date: Tue, 4 Jun 2019 19:55:59 +0200 Subject: [PATCH 3/5] Add check_process upgarde from 0.9.0 --- check_process | 1 + 1 file changed, 1 insertion(+) diff --git a/check_process b/check_process index ea6439c7..70946c0e 100644 --- a/check_process +++ b/check_process @@ -10,6 +10,7 @@ setup_private=1 setup_public=1 upgrade=1 + upgrade=1 from_commit=e53882baaed30f38293a4ec9d1395c6833759169 backup_restore=1 multi_instance=1 incorrect_path=1 From e0cab945651b19cc765848a6df515f70e48d1062 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Thu, 6 Jun 2019 02:39:01 +0200 Subject: [PATCH 4/5] Fix Google Recaptcha removal --- scripts/install | 5 +++++ scripts/upgrade | 9 +++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/scripts/install b/scripts/install index 11140814..aab746d3 100644 --- a/scripts/install +++ b/scripts/install @@ -120,6 +120,11 @@ chown -R "$app": "$final_path" ynh_install_composer --phpversion="7.2" --workdir="$final_path" +# Fix Google Recaptcha removal +ynh_secure_remove --file="$final_path/bootstrap/cache" +mkdir -p "$final_path/bootstrap/cache" +ynh_composer_exec --phpversion="7.2" --workdir="$final_path" --commands="dump-autoload" + #================================================= # SPECIFIC SETUP #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 2fdafb35..ddf7f7ee 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -145,12 +145,17 @@ ynh_add_fpm_config --phpversion="7.2" #================================================= # SPECIFIC UPGRADE #================================================= -# INSTALL PHP DEPENDENCIES +# UPDATE PHP DEPENDENCIES #================================================= chown -R "$app": "$final_path" -ynh_install_composer --phpversion="7.2" --workdir="$final_path" +# Fix Google Recaptcha removal +ynh_secure_remove --file="$final_path/bootstrap/cache" +mkdir -p "$final_path/bootstrap/cache" +ynh_composer_exec --phpversion="7.2" --workdir="$final_path" --commands="dump-autoload" + +ynh_composer_exec --phpversion="7.2" --workdir="$final_path" --commands="update" #================================================= # MODIFY A CONFIG FILE From b5dc2374aadc233f3e7b24389ca4075513cabe47 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Thu, 6 Jun 2019 21:41:55 +0200 Subject: [PATCH 5/5] Fix client_max_body_size --- conf/nginx.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 14cbc899..5e9f8699 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -12,7 +12,7 @@ location __PATH__/ { index index.php; # Common parameter to increase upload size limit in conjunction with dedicated php-fpm file - #client_max_body_size 50M; + client_max_body_size 100M; location ~ [^/]\.php(/|$) { fastcgi_split_path_info ^(.+?\.php)(/.*)$;