From fba54a488401d27c23b764481312963c465b62b8 Mon Sep 17 00:00:00 2001 From: lapineige Date: Wed, 3 May 2023 09:25:53 +0200 Subject: [PATCH 01/17] v0.11.6 --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 70aa95fa..71496591 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.11.5~ynh3", + "version": "0.11.6~ynh1", "url": "https://pixelfed.org/", "upstream": { "license": "AGPL-3.0-or-later", From 6949b860a5f5002175d82bc035f9cf5ae81edb1e Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 3 May 2023 07:25:56 +0000 Subject: [PATCH 02/17] 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 08ce1f29..10cffdfc 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ In addition to taking over the functionality of Instagram, the functioning of Pi It is also possible to import your data from Instagram. -**Shipped version:** 0.11.5~ynh3 +**Shipped version:** 0.11.6~ynh1 ## Screenshots diff --git a/README_fr.md b/README_fr.md index 647a70fa..795db7c2 100644 --- a/README_fr.md +++ b/README_fr.md @@ -26,7 +26,7 @@ En plus de reprendre les fonctionnalités d'Instagram, le fonctionnement de Pixe Il est également possible d'importer ses données depuis Instagram. -**Version incluse :** 0.11.5~ynh3 +**Version incluse :** 0.11.6~ynh1 ## Captures d’écran From b64b855b4f2081997911aee7bccb5e4bc4b22761 Mon Sep 17 00:00:00 2001 From: lapineige Date: Wed, 3 May 2023 09:26:47 +0200 Subject: [PATCH 03/17] v0.11.6 --- conf/app.src | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/app.src b/conf/app.src index ace5a0ee..a3d25fa9 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/pixelfed/pixelfed/archive/21714eec342d079c169210c49099b2988bbb205b.tar.gz -SOURCE_SUM=eff6d2e4d93af1ef05d01fab2c55ebe6f55bf82866edcdc9af3a72767976a52d +SOURCE_URL=https://github.com/pixelfed/pixelfed/archive/refs/tags/v0.11.6.tar.gz +SOURCE_SUM=da498b0e93308ac501c3c97b41af6d695b29811807aeb8c1071e06fec385d967 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true From f361a3661db29c3bd7b779008c013d1d59f0ee1f Mon Sep 17 00:00:00 2001 From: lapineige Date: Wed, 3 May 2023 09:48:21 +0200 Subject: [PATCH 04/17] bump to php8.2 --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 71496591..705867c3 100644 --- a/manifest.json +++ b/manifest.json @@ -30,7 +30,7 @@ "multi_instance": true, "services": [ "nginx", - "php8.1-fpm" + "php8.2-fpm" ], "arguments": { "install": [ From c4cb2f77be5914ff94fd4b3a7f8fb00e9982f48f Mon Sep 17 00:00:00 2001 From: lapineige Date: Wed, 3 May 2023 09:50:14 +0200 Subject: [PATCH 05/17] php8.2 / composer 2.2 --- scripts/_common.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index ec0b5b76..0c4701c8 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -4,9 +4,9 @@ # COMMON VARIABLES #================================================= -YNH_PHP_VERSION="8.1" +YNH_PHP_VERSION="8.2" -YNH_COMPOSER_VERSION="2.1.5" +YNH_COMPOSER_VERSION="2.2" pkg_dependencies="postgresql libgd3 jpegoptim optipng pngquant ffmpeg imagemagick supervisor php${YNH_PHP_VERSION}-redis php${YNH_PHP_VERSION}-bcmath php${YNH_PHP_VERSION}-cli php${YNH_PHP_VERSION}-ctype php${YNH_PHP_VERSION}-curl php${YNH_PHP_VERSION}-exif php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-iconv php${YNH_PHP_VERSION}-intl php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-tokenizer php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-zip php${YNH_PHP_VERSION}-pdo php${YNH_PHP_VERSION}-pgsql php${YNH_PHP_VERSION}-fileinfo php${YNH_PHP_VERSION}-imagick" From fbea37e3b6a1bde2f85dbb7e970f8fce5833e0a3 Mon Sep 17 00:00:00 2001 From: lapineige Date: Wed, 3 May 2023 10:05:29 +0200 Subject: [PATCH 06/17] Fix composer version (2.2.21) --- scripts/_common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 0c4701c8..a0bb3d0d 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -6,7 +6,7 @@ YNH_PHP_VERSION="8.2" -YNH_COMPOSER_VERSION="2.2" +YNH_COMPOSER_VERSION="2.2.21" pkg_dependencies="postgresql libgd3 jpegoptim optipng pngquant ffmpeg imagemagick supervisor php${YNH_PHP_VERSION}-redis php${YNH_PHP_VERSION}-bcmath php${YNH_PHP_VERSION}-cli php${YNH_PHP_VERSION}-ctype php${YNH_PHP_VERSION}-curl php${YNH_PHP_VERSION}-exif php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-iconv php${YNH_PHP_VERSION}-intl php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-tokenizer php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-zip php${YNH_PHP_VERSION}-pdo php${YNH_PHP_VERSION}-pgsql php${YNH_PHP_VERSION}-fileinfo php${YNH_PHP_VERSION}-imagick" From c8672ad447edd323c68dae14b83096b2fe20eff8 Mon Sep 17 00:00:00 2001 From: lapineige Date: Wed, 3 May 2023 20:03:36 +0200 Subject: [PATCH 07/17] ENABLE_CONFIG_CACHE=1 --- conf/.env | 3 +++ 1 file changed, 3 insertions(+) diff --git a/conf/.env b/conf/.env index 71627f31..74dcc85d 100644 --- a/conf/.env +++ b/conf/.env @@ -143,3 +143,6 @@ TRUST_PROXIES="*" ## Passport #PASSPORT_PRIVATE_KEY= #PASSPORT_PUBLIC_KEY= + +# Edit this from admin UI +ENABLE_CONFIG_CACHE=true From 16ff1025264b5d984148c5474dd920cab1f5d13b Mon Sep 17 00:00:00 2001 From: lapineige Date: Thu, 4 May 2023 11:46:49 +0200 Subject: [PATCH 08/17] Fix config/filesystems.php local driver permissions https://github.com/YunoHost-Apps/pixelfed_ynh/issues/211 --- scripts/upgrade | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index c2254f3d..e5afb20f 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -184,13 +184,17 @@ ynh_add_nginx_config # UPDATE COMPOSER DEPENDENCIES #================================================= ynh_script_progression --message="Updating composer..." --weight=1 - ynh_exec_warn_less ynh_composer_exec --workdir="$final_path" --commands="self-update" ynh_script_progression --message="Updating composer dependencies..." --weight=1 - ynh_exec_warn_less ynh_composer_exec --workdir="$final_path" --commands="update" +#================================================= +# PATCH PERMISSIONS for v0.11.5 versions and higher +#================================================= +ynh_script_progression --message="Patching permissions (for version 0.11.5 and newer)..." --weight=1 +ynh_replace_string --match_string="'private' => 0700," --replace_string="'private' => 0750," --target_file=$final_path/config/filesystems.php + #================================================= # DEPLOYMENT #================================================= From 24f3a630a646fed036a0a09c422afa8b30323a04 Mon Sep 17 00:00:00 2001 From: lapineige Date: Thu, 4 May 2023 11:49:10 +0200 Subject: [PATCH 09/17] Update manifest.json --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 705867c3..ad74648b 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.11.6~ynh1", + "version": "0.11.6~ynh2", "url": "https://pixelfed.org/", "upstream": { "license": "AGPL-3.0-or-later", From 17b54be0ac909fee05e67a948d7ad4daca50f1c1 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 4 May 2023 09:49:14 +0000 Subject: [PATCH 10/17] 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 10cffdfc..53554d74 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ In addition to taking over the functionality of Instagram, the functioning of Pi It is also possible to import your data from Instagram. -**Shipped version:** 0.11.6~ynh1 +**Shipped version:** 0.11.6~ynh2 ## Screenshots diff --git a/README_fr.md b/README_fr.md index 795db7c2..d20a96ca 100644 --- a/README_fr.md +++ b/README_fr.md @@ -26,7 +26,7 @@ En plus de reprendre les fonctionnalités d'Instagram, le fonctionnement de Pixe Il est également possible d'importer ses données depuis Instagram. -**Version incluse :** 0.11.6~ynh1 +**Version incluse :** 0.11.6~ynh2 ## Captures d’écran From cb640d3c62736f85636f15a06ef639bcf12c238f Mon Sep 17 00:00:00 2001 From: lapineige Date: Thu, 4 May 2023 12:12:51 +0200 Subject: [PATCH 11/17] Remove config cache Revert https://github.com/YunoHost-Apps/pixelfed_ynh/pull/215/commits/c8672ad447edd323c68dae14b83096b2fe20eff8 --- conf/.env | 3 --- 1 file changed, 3 deletions(-) diff --git a/conf/.env b/conf/.env index 74dcc85d..71627f31 100644 --- a/conf/.env +++ b/conf/.env @@ -143,6 +143,3 @@ TRUST_PROXIES="*" ## Passport #PASSPORT_PRIVATE_KEY= #PASSPORT_PUBLIC_KEY= - -# Edit this from admin UI -ENABLE_CONFIG_CACHE=true From 0a97f36c4e640f7a8294700175f7b76779b0dccb Mon Sep 17 00:00:00 2001 From: lapineige Date: Thu, 4 May 2023 14:54:10 +0200 Subject: [PATCH 12/17] Patch broken permissions #211 --- scripts/upgrade | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/upgrade b/scripts/upgrade index e5afb20f..51213c1b 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -193,7 +193,10 @@ ynh_exec_warn_less ynh_composer_exec --workdir="$final_path" --commands="update" # PATCH PERMISSIONS for v0.11.5 versions and higher #================================================= ynh_script_progression --message="Patching permissions (for version 0.11.5 and newer)..." --weight=1 +# Default configuration doesn't work ynh_replace_string --match_string="'private' => 0700," --replace_string="'private' => 0750," --target_file=$final_path/config/filesystems.php +# Repair permissions for files created after v0.11.5 and before this patch +chmod 750 -R "$final_path/public/storage/m/_v2/" #================================================= # DEPLOYMENT From 2d149fd9f63d09a60a0eef5ec1c6151bc2d331c7 Mon Sep 17 00:00:00 2001 From: lapineige Date: Thu, 4 May 2023 20:43:13 +0200 Subject: [PATCH 13/17] Update php-fpm.conf https://github.com/YunoHost-Apps/pixelfed_ynh/issues/211#issuecomment-1535026590 --- conf/php-fpm.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/php-fpm.conf b/conf/php-fpm.conf index b4c2372f..73d36ee2 100644 --- a/conf/php-fpm.conf +++ b/conf/php-fpm.conf @@ -21,7 +21,7 @@ ; Note: The user is mandatory. If the group is not set, the default user's group ; will be used. user = __USER__ -group = __USER__ +group = www-data ; The address on which to accept FastCGI requests. ; Valid syntaxes are: From 7b330d30478d488790bf437898d26daa45009c03 Mon Sep 17 00:00:00 2001 From: lapineige Date: Thu, 4 May 2023 23:06:33 +0200 Subject: [PATCH 14/17] Check if folder exist before chmod (fix CI) --- scripts/upgrade | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index 51213c1b..d86f3486 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -196,7 +196,9 @@ ynh_script_progression --message="Patching permissions (for version 0.11.5 and n # Default configuration doesn't work ynh_replace_string --match_string="'private' => 0700," --replace_string="'private' => 0750," --target_file=$final_path/config/filesystems.php # Repair permissions for files created after v0.11.5 and before this patch -chmod 750 -R "$final_path/public/storage/m/_v2/" +if [ -d "$final_path/public/storage/m/_v2/" ]; then + chmod 750 -R "$final_path/public/storage/m/_v2/" +fi #================================================= # DEPLOYMENT From 56e0cc1847c40c0e00b52b1247c5650f96d40ae3 Mon Sep 17 00:00:00 2001 From: lapineige Date: Fri, 5 May 2023 19:11:51 +0200 Subject: [PATCH 15/17] Fix rights --- scripts/upgrade | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index d86f3486..59c4d1f9 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -197,7 +197,9 @@ ynh_script_progression --message="Patching permissions (for version 0.11.5 and n ynh_replace_string --match_string="'private' => 0700," --replace_string="'private' => 0750," --target_file=$final_path/config/filesystems.php # Repair permissions for files created after v0.11.5 and before this patch if [ -d "$final_path/public/storage/m/_v2/" ]; then - chmod 750 -R "$final_path/public/storage/m/_v2/" + chmod 750 -R "$final_path/public/storage/m/_v2/*" # all files subdirectories (picture folders) should be readable and executable. But if there is no picture, there is no /*/* + chmod 770 "$final_path/public/storage/m/_v2/" # this should be 770 + chmod 770 "$final_path/public/storage/m/_v2/*" # users folders should be 770 fi #================================================= From 7c471bb6b87be37c8119e7a83baa53bc6b6391b7 Mon Sep 17 00:00:00 2001 From: lapineige Date: Mon, 8 May 2023 23:04:39 +0200 Subject: [PATCH 16/17] fix wildcard syntax It doesn't work within quotes --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index 59c4d1f9..3826778a 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -197,7 +197,7 @@ ynh_script_progression --message="Patching permissions (for version 0.11.5 and n ynh_replace_string --match_string="'private' => 0700," --replace_string="'private' => 0750," --target_file=$final_path/config/filesystems.php # Repair permissions for files created after v0.11.5 and before this patch if [ -d "$final_path/public/storage/m/_v2/" ]; then - chmod 750 -R "$final_path/public/storage/m/_v2/*" # all files subdirectories (picture folders) should be readable and executable. But if there is no picture, there is no /*/* + chmod 750 -R "$final_path/public/storage/m/_v2/"* # all files subdirectories (picture folders) should be readable and executable. But if there is no picture, there is no /*/* chmod 770 "$final_path/public/storage/m/_v2/" # this should be 770 chmod 770 "$final_path/public/storage/m/_v2/*" # users folders should be 770 fi From a4c8867762cc5c9904617a01ebf3556bb4c332f1 Mon Sep 17 00:00:00 2001 From: lapineige Date: Tue, 9 May 2023 10:31:34 +0200 Subject: [PATCH 17/17] Fix the other wildcard + reordering --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index 3826778a..9388a218 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -198,8 +198,8 @@ ynh_replace_string --match_string="'private' => 0700," --replace_string="'privat # Repair permissions for files created after v0.11.5 and before this patch if [ -d "$final_path/public/storage/m/_v2/" ]; then chmod 750 -R "$final_path/public/storage/m/_v2/"* # all files subdirectories (picture folders) should be readable and executable. But if there is no picture, there is no /*/* + chmod 770 "$final_path/public/storage/m/_v2/"* # users folders should be 770 chmod 770 "$final_path/public/storage/m/_v2/" # this should be 770 - chmod 770 "$final_path/public/storage/m/_v2/*" # users folders should be 770 fi #=================================================