diff --git a/README.md b/README.md index f2773b32..e7f6ab26 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.7~ynh1 ## Screenshots diff --git a/README_fr.md b/README_fr.md index 544d9d48..88766104 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.7~ynh1 ## Captures d’écran diff --git a/conf/app.src b/conf/app.src index a3d25fa9..821e92a5 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/pixelfed/pixelfed/archive/refs/tags/v0.11.6.tar.gz -SOURCE_SUM=da498b0e93308ac501c3c97b41af6d695b29811807aeb8c1071e06fec385d967 +SOURCE_URL=https://github.com/pixelfed/pixelfed/archive/refs/tags/v0.11.7.tar.gz +SOURCE_SUM=eb27aa61c337c3dbca3c0e59cbd86069da1dbc7dea988630d3453cd92dcc75e7 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true 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: diff --git a/manifest.json b/manifest.json index 705867c3..a57868d6 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.7~ynh1", "url": "https://pixelfed.org/", "upstream": { "license": "AGPL-3.0-or-later", diff --git a/scripts/upgrade b/scripts/upgrade index c2254f3d..9388a218 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -184,13 +184,24 @@ 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 +# 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 +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 +fi + #================================================= # DEPLOYMENT #=================================================