From 0c7c2b4f894b1a74d6d5f3165138aded9c16b60c Mon Sep 17 00:00:00 2001 From: lapineige Date: Fri, 1 Sep 2023 08:22:32 +0200 Subject: [PATCH] Testing : fix php/pictures permissions (#239) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * v2 * v2 * Create tests.toml * Auto-update README * fix * Update _common.sh * Update install * Update manifest.toml * Update manifest.toml * cleaning * Auto-update README * Auto-update README * Add post edits (from dev branch) Using lastest commit as most of the previous ones fix edits stuff + bugs https://github.com/pixelfed/pixelfed/commit/5cfe8cd56a5a9f9fb1b1c813d50d07ba6839181d * bump version * Auto-update README * cleaning * Update manifest.toml * Auto-update README * Update ADMIN.md * Update change_url * php8.2 * php8.2 * add ressources needed * php8.2 * update PHP * post edit formatting fixes https://github.com/pixelfed/pixelfed/commit/4479055e1e4700a58479f038d5b0d5d14e2f6897 * v0.11.8 * v0.11.8 * Auto-update README * Master -> ynh V2 (v0.11.8) * Auto-update README * Update .env * Fix .env + improvements https://github.com/YunoHost-Apps/pixelfed_ynh/pull/219#issuecomment-1568049256 * Update manifest.toml * Auto-update README * Typo * Patch file access right (fix post 0.11.5 installs) * Bump version (post v0.11.5 install fixes) * Auto-update README * Update extra_php-fpm.conf Fix #223 * Testing : fix ≥0.11.5 installs (#222) (#225) * v2 * v2 * Create tests.toml * Auto-update README * fix * Update _common.sh * Update install * Update manifest.toml * Update manifest.toml * cleaning * Auto-update README * Auto-update README * Add post edits (from dev branch) Using lastest commit as most of the previous ones fix edits stuff + bugs https://github.com/pixelfed/pixelfed/commit/5cfe8cd56a5a9f9fb1b1c813d50d07ba6839181d * bump version * Auto-update README * cleaning * Update manifest.toml * Auto-update README * Update ADMIN.md * Update change_url * php8.2 * php8.2 * add ressources needed * php8.2 * update PHP * post edit formatting fixes https://github.com/pixelfed/pixelfed/commit/4479055e1e4700a58479f038d5b0d5d14e2f6897 * v0.11.8 * v0.11.8 * Auto-update README * Master -> ynh V2 (v0.11.8) * Auto-update README * Update .env * Fix .env + improvements https://github.com/YunoHost-Apps/pixelfed_ynh/pull/219#issuecomment-1568049256 * Update manifest.toml * Auto-update README * Typo * Patch file access right (fix post 0.11.5 installs) * Bump version (post v0.11.5 install fixes) * Auto-update README --------- Co-authored-by: Éric Gaspar <46165813+ericgaspar@users.noreply.github.com> Co-authored-by: yunohost-bot Co-authored-by: ericgaspar * Bump version * Auto-update README * Fix post-v2 issues * Patch post v0.11.5 permissions Why are they not correct by default ? * Testing : fix images rights in package v2 (#224) (#227) * v2 * v2 * Create tests.toml * Auto-update README * fix * Update _common.sh * Update install * Update manifest.toml * Update manifest.toml * cleaning * Auto-update README * Auto-update README * Add post edits (from dev branch) Using lastest commit as most of the previous ones fix edits stuff + bugs https://github.com/pixelfed/pixelfed/commit/5cfe8cd56a5a9f9fb1b1c813d50d07ba6839181d * bump version * Auto-update README * cleaning * Update manifest.toml * Auto-update README * Update ADMIN.md * Update change_url * php8.2 * php8.2 * add ressources needed * php8.2 * update PHP * post edit formatting fixes https://github.com/pixelfed/pixelfed/commit/4479055e1e4700a58479f038d5b0d5d14e2f6897 * v0.11.8 * v0.11.8 * Auto-update README * Master -> ynh V2 (v0.11.8) * Auto-update README * Update .env * Fix .env + improvements https://github.com/YunoHost-Apps/pixelfed_ynh/pull/219#issuecomment-1568049256 * Update manifest.toml * Auto-update README * Typo * Patch file access right (fix post 0.11.5 installs) * Bump version (post v0.11.5 install fixes) * Auto-update README * Update extra_php-fpm.conf Fix #223 * Testing : fix ≥0.11.5 installs (#222) (#225) * v2 * v2 * Create tests.toml * Auto-update README * fix * Update _common.sh * Update install * Update manifest.toml * Update manifest.toml * cleaning * Auto-update README * Auto-update README * Add post edits (from dev branch) Using lastest commit as most of the previous ones fix edits stuff + bugs https://github.com/pixelfed/pixelfed/commit/5cfe8cd56a5a9f9fb1b1c813d50d07ba6839181d * bump version * Auto-update README * cleaning * Update manifest.toml * Auto-update README * Update ADMIN.md * Update change_url * php8.2 * php8.2 * add ressources needed * php8.2 * update PHP * post edit formatting fixes https://github.com/pixelfed/pixelfed/commit/4479055e1e4700a58479f038d5b0d5d14e2f6897 * v0.11.8 * v0.11.8 * Auto-update README * Master -> ynh V2 (v0.11.8) * Auto-update README * Update .env * Fix .env + improvements https://github.com/YunoHost-Apps/pixelfed_ynh/pull/219#issuecomment-1568049256 * Update manifest.toml * Auto-update README * Typo * Patch file access right (fix post 0.11.5 installs) * Bump version (post v0.11.5 install fixes) * Auto-update README --------- * Bump version * Auto-update README * Fix post-v2 issues --------- Co-authored-by: Éric Gaspar <46165813+ericgaspar@users.noreply.github.com> Co-authored-by: yunohost-bot Co-authored-by: ericgaspar * Bump version * Auto-update README * Fix mail sendmail (#230) * Testing : patch install permissions (#226) * v2 * v2 * Create tests.toml * Auto-update README * fix * Update _common.sh * Update install * Update manifest.toml * Update manifest.toml * cleaning * Auto-update README * Auto-update README * Add post edits (from dev branch) Using lastest commit as most of the previous ones fix edits stuff + bugs https://github.com/pixelfed/pixelfed/commit/5cfe8cd56a5a9f9fb1b1c813d50d07ba6839181d * bump version * Auto-update README * cleaning * Update manifest.toml * Auto-update README * Update ADMIN.md * Update change_url * php8.2 * php8.2 * add ressources needed * php8.2 * update PHP * post edit formatting fixes https://github.com/pixelfed/pixelfed/commit/4479055e1e4700a58479f038d5b0d5d14e2f6897 * v0.11.8 * v0.11.8 * Auto-update README * Master -> ynh V2 (v0.11.8) * Auto-update README * Update .env * Fix .env + improvements https://github.com/YunoHost-Apps/pixelfed_ynh/pull/219#issuecomment-1568049256 * Update manifest.toml * Auto-update README * Typo * Patch file access right (fix post 0.11.5 installs) * Bump version (post v0.11.5 install fixes) * Auto-update README * Update extra_php-fpm.conf Fix #223 * Testing : fix ≥0.11.5 installs (#222) (#225) * v2 * v2 * Create tests.toml * Auto-update README * fix * Update _common.sh * Update install * Update manifest.toml * Update manifest.toml * cleaning * Auto-update README * Auto-update README * Add post edits (from dev branch) Using lastest commit as most of the previous ones fix edits stuff + bugs https://github.com/pixelfed/pixelfed/commit/5cfe8cd56a5a9f9fb1b1c813d50d07ba6839181d * bump version * Auto-update README * cleaning * Update manifest.toml * Auto-update README * Update ADMIN.md * Update change_url * php8.2 * php8.2 * add ressources needed * php8.2 * update PHP * post edit formatting fixes https://github.com/pixelfed/pixelfed/commit/4479055e1e4700a58479f038d5b0d5d14e2f6897 * v0.11.8 * v0.11.8 * Auto-update README * Master -> ynh V2 (v0.11.8) * Auto-update README * Update .env * Fix .env + improvements https://github.com/YunoHost-Apps/pixelfed_ynh/pull/219#issuecomment-1568049256 * Update manifest.toml * Auto-update README * Typo * Patch file access right (fix post 0.11.5 installs) * Bump version (post v0.11.5 install fixes) * Auto-update README --------- Co-authored-by: Éric Gaspar <46165813+ericgaspar@users.noreply.github.com> Co-authored-by: yunohost-bot Co-authored-by: ericgaspar * Bump version * Auto-update README * Fix post-v2 issues * Patch post v0.11.5 permissions Why are they not correct by default ? * Testing : fix images rights in package v2 (#224) (#227) * v2 * v2 * Create tests.toml * Auto-update README * fix * Update _common.sh * Update install * Update manifest.toml * Update manifest.toml * cleaning * Auto-update README * Auto-update README * Add post edits (from dev branch) Using lastest commit as most of the previous ones fix edits stuff + bugs https://github.com/pixelfed/pixelfed/commit/5cfe8cd56a5a9f9fb1b1c813d50d07ba6839181d * bump version * Auto-update README * cleaning * Update manifest.toml * Auto-update README * Update ADMIN.md * Update change_url * php8.2 * php8.2 * add ressources needed * php8.2 * update PHP * post edit formatting fixes https://github.com/pixelfed/pixelfed/commit/4479055e1e4700a58479f038d5b0d5d14e2f6897 * v0.11.8 * v0.11.8 * Auto-update README * Master -> ynh V2 (v0.11.8) * Auto-update README * Update .env * Fix .env + improvements https://github.com/YunoHost-Apps/pixelfed_ynh/pull/219#issuecomment-1568049256 * Update manifest.toml * Auto-update README * Typo * Patch file access right (fix post 0.11.5 installs) * Bump version (post v0.11.5 install fixes) * Auto-update README * Update extra_php-fpm.conf Fix #223 * Testing : fix ≥0.11.5 installs (#222) (#225) * v2 * v2 * Create tests.toml * Auto-update README * fix * Update _common.sh * Update install * Update manifest.toml * Update manifest.toml * cleaning * Auto-update README * Auto-update README * Add post edits (from dev branch) Using lastest commit as most of the previous ones fix edits stuff + bugs https://github.com/pixelfed/pixelfed/commit/5cfe8cd56a5a9f9fb1b1c813d50d07ba6839181d * bump version * Auto-update README * cleaning * Update manifest.toml * Auto-update README * Update ADMIN.md * Update change_url * php8.2 * php8.2 * add ressources needed * php8.2 * update PHP * post edit formatting fixes https://github.com/pixelfed/pixelfed/commit/4479055e1e4700a58479f038d5b0d5d14e2f6897 * v0.11.8 * v0.11.8 * Auto-update README * Master -> ynh V2 (v0.11.8) * Auto-update README * Update .env * Fix .env + improvements https://github.com/YunoHost-Apps/pixelfed_ynh/pull/219#issuecomment-1568049256 * Update manifest.toml * Auto-update README * Typo * Patch file access right (fix post 0.11.5 installs) * Bump version (post v0.11.5 install fixes) * Auto-update README --------- * Bump version * Auto-update README * Fix post-v2 issues --------- Co-authored-by: Éric Gaspar <46165813+ericgaspar@users.noreply.github.com> Co-authored-by: yunohost-bot Co-authored-by: ericgaspar * Bump version * Auto-update README --------- Co-authored-by: Éric Gaspar <46165813+ericgaspar@users.noreply.github.com> Co-authored-by: yunohost-bot Co-authored-by: ericgaspar * Update .env use sendmail for default mail sending, should work out of the box for fresh installs * patch source prevent privilege escalation * patching source prevent privilege escalation * patching source prevent privilege escalation * Update manifest.toml Enable authentication on the mail stack for the system user * Update .env authentication on the mail stack with app system user * Fix old email configs --------- Co-authored-by: lapineige Co-authored-by: Éric Gaspar <46165813+ericgaspar@users.noreply.github.com> Co-authored-by: yunohost-bot Co-authored-by: ericgaspar * remove full_domain * Add manual email verification doc (#233) * Add manual email verification doc * email verification doc (fr) * fix doc * 0.11.9 (#236) * v0.11.9 * Auto-update README --------- Co-authored-by: yunohost-bot * Update manifest.toml * Auto-update README * Fix php conf & image permissions (#238) * Transfer to normal php conf * Transfer to normal php conf * Add running directory * Rename php_fpm.conf to php-fpm.conf * bump version * Auto-update README * bump minimum YNH version * switch back to extra_php * Set proper group owner for php Using new helper https://github.com/YunoHost/yunohost/commit/65d25710725b06d281630644b80d8d01dfba1bde * Set proper group owner for php * manifest: fix yunohost version requirement typo --------- Co-authored-by: yunohost-bot Co-authored-by: Alexandre Aubin --------- Co-authored-by: Éric Gaspar <46165813+ericgaspar@users.noreply.github.com> Co-authored-by: yunohost-bot Co-authored-by: ericgaspar Co-authored-by: themancalledjakob Co-authored-by: Alexandre Aubin --- README.md | 2 +- README_fr.md | 2 +- conf/extra_php-fpm.conf | 3 --- manifest.toml | 4 ++-- scripts/install | 2 +- scripts/upgrade | 2 +- 6 files changed, 6 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index ef662253..5cde47bb 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.9~ynh1 +**Shipped version:** 0.11.9~ynh2 ## Screenshots diff --git a/README_fr.md b/README_fr.md index 1906a50d..256b2bac 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.9~ynh1 +**Version incluse :** 0.11.9~ynh2 ## Captures d’écran diff --git a/conf/extra_php-fpm.conf b/conf/extra_php-fpm.conf index c979f58d..f7960328 100644 --- a/conf/extra_php-fpm.conf +++ b/conf/extra_php-fpm.conf @@ -2,6 +2,3 @@ php_admin_value[upload_max_filesize] = 100M php_admin_value[post_max_size] = 100M - -; Group should not be pixelfed, unless image (folder) access rights are not working -group = www-data diff --git a/manifest.toml b/manifest.toml index 90f6d778..534438b0 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Pixelfed" description.en = "ActivityPub Federated Image Sharing" description.fr = "Logiciel de partage d'image fédéré via ActivityPub" -version = "0.11.9~ynh1" +version = "0.11.9~ynh2" maintainers = ["yalh76", "Lapineige"] @@ -17,7 +17,7 @@ userdoc = "https://docs.pixelfed.org/" code = "https://github.com/pixelfed/pixelfed" [integration] -yunohost = ">= 11.1.19" +yunohost = ">= 11.2.4" architectures = "all" multi_instance = true ldap = false diff --git a/scripts/install b/scripts/install index 38a3213e..8519654c 100644 --- a/scripts/install +++ b/scripts/install @@ -61,7 +61,7 @@ ynh_replace_string --match_string="'/usr/sbin/sendmail -bs'" --replace_string="' #================================================= ynh_script_progression --message="Configuring PHP-FPM..." --weight=1 -ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint +ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint --group=www-data ynh_add_nginx_config diff --git a/scripts/upgrade b/scripts/upgrade index da9f593e..891ab379 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -133,7 +133,7 @@ ynh_replace_string --match_string="'/usr/sbin/sendmail -bs'" --replace_string="' ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=1 # Create a dedicated PHP-FPM config -ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint +ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint --group=www-data #================================================= # NGINX CONFIGURATION