From f5a96000c55d19797abdb4c4a943459e0cd33739 Mon Sep 17 00:00:00 2001 From: lapineige Date: Tue, 14 Feb 2023 21:04:52 +0100 Subject: [PATCH 01/13] Restrict permission on log file Incorrect permissions make logrotate fails `error: skipping "/var/log/pixelfed/pixelfed-horizon.log" because parent directory has insecure permissions (It's world writable or writable by group which is not "root") Set "su" directive in config file to tell logrotate which user/group should be used for rotation.` --- scripts/upgrade | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/upgrade b/scripts/upgrade index 862c6df5..226cda40 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -223,6 +223,7 @@ ynh_script_progression --message="Creating log file..." --weight=1 mkdir -p "/var/log/$app/" touch "/var/log/$app/${app}-horizon.log" chown -R $app: "/var/log/$app/" +chmod 600 $app: "/var/log/$app/" #================================================= # UPGRADE THE CRON FILE From 2585830884b959a5062046813bbae22854e44a90 Mon Sep 17 00:00:00 2001 From: lapineige Date: Tue, 14 Feb 2023 21:04:54 +0100 Subject: [PATCH 02/13] Restrict permission on log file Incorrect permissions make logrotate fails `error: skipping "/var/log/pixelfed/pixelfed-horizon.log" because parent directory has insecure permissions (It's world writable or writable by group which is not "root") Set "su" directive in config file to tell logrotate which user/group should be used for rotation.` --- scripts/install | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/install b/scripts/install index cf94b71f..2113c2dd 100644 --- a/scripts/install +++ b/scripts/install @@ -135,6 +135,7 @@ ynh_script_progression --message="Creating log file..." --weight=1 mkdir -p "/var/log/$app/" touch "/var/log/$app/${app}-horizon.log" chown -R $app: "/var/log/$app/" +chmod 600 $app: "/var/log/$app/" #================================================= # ADD A CONFIGURATION From 6c8b6a07bc0dc2629535cb350360482b8c0c2934 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 14 Feb 2023 20:04:57 +0000 Subject: [PATCH 03/13] Auto-update README --- README.md | 3 ++- README_fr.md | 21 +++++++++++---------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 3b36507a..aa14331d 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,8 @@ It shall NOT be edited by hand. # Pixelfed for YunoHost -[![Integration level](https://dash.yunohost.org/integration/pixelfed.svg)](https://dash.yunohost.org/appci/app/pixelfed) ![Working status](https://ci-apps.yunohost.org/ci/badges/pixelfed.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/pixelfed.maintain.svg) +[![Integration level](https://dash.yunohost.org/integration/pixelfed.svg)](https://dash.yunohost.org/appci/app/pixelfed) ![Working status](https://ci-apps.yunohost.org/ci/badges/pixelfed.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/pixelfed.maintain.svg) + [![Install Pixelfed with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=pixelfed) *[Lire ce readme en français.](./README_fr.md)* diff --git a/README_fr.md b/README_fr.md index db1f684f..a0da2b33 100644 --- a/README_fr.md +++ b/README_fr.md @@ -5,15 +5,16 @@ It shall NOT be edited by hand. # Pixelfed pour YunoHost -[![Niveau d'intégration](https://dash.yunohost.org/integration/pixelfed.svg)](https://dash.yunohost.org/appci/app/pixelfed) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/pixelfed.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/pixelfed.maintain.svg) +[![Niveau d’intégration](https://dash.yunohost.org/integration/pixelfed.svg)](https://dash.yunohost.org/appci/app/pixelfed) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/pixelfed.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/pixelfed.maintain.svg) + [![Installer Pixelfed avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=pixelfed) *[Read this readme in english.](./README.md)* -> *Ce package vous permet d'installer Pixelfed rapidement et simplement sur un serveur YunoHost. -Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l'installer et en profiter.* +> *Ce package vous permet d’installer Pixelfed rapidement et simplement sur un serveur YunoHost. +Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l’installer et en profiter.* -## Vue d'ensemble +## Vue d’ensemble PixelFed est un logiciel décentralisé et fédéré de partage d'images en cours de développement. En plus de reprendre les fonctionnalités d'Instagram, le fonctionnement de PixelFed est: @@ -27,9 +28,9 @@ Il est également possible d'importer ses données depuis Instagram. **Version incluse :** 0.11.4~ynh4 -## Captures d'écran +## Captures d’écran -![Capture d'écran de Pixelfed](./doc/screenshots/screenshots.jpg) +![Capture d’écran de Pixelfed](./doc/screenshots/screenshots.jpg) ## Avertissements / informations importantes @@ -74,10 +75,10 @@ Depuis la 0.10.10, par défaut `/discover/places/`, `/stories/` et `/i/` sont pr ## Documentations et ressources -* Site officiel de l'app : +* Site officiel de l’app : * Documentation officielle utilisateur : -* Documentation officielle de l'admin : -* Dépôt de code officiel de l'app : +* Documentation officielle de l’admin : +* Dépôt de code officiel de l’app : * Documentation YunoHost pour cette app : * Signaler un bug : @@ -93,4 +94,4 @@ ou sudo yunohost app upgrade pixelfed -u https://github.com/YunoHost-Apps/pixelfed_ynh/tree/testing --debug ``` -**Plus d'infos sur le packaging d'applications :** +**Plus d’infos sur le packaging d’applications :** \ No newline at end of file From 1c15b1660f4f27f2a5ea56b3564b97919a94b584 Mon Sep 17 00:00:00 2001 From: lapineige Date: Sat, 18 Feb 2023 20:22:39 +0100 Subject: [PATCH 04/13] fix chmod syntax --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 2113c2dd..3ece026e 100644 --- a/scripts/install +++ b/scripts/install @@ -135,7 +135,7 @@ ynh_script_progression --message="Creating log file..." --weight=1 mkdir -p "/var/log/$app/" touch "/var/log/$app/${app}-horizon.log" chown -R $app: "/var/log/$app/" -chmod 600 $app: "/var/log/$app/" +chmod -R 600 $app: "/var/log/$app/" #================================================= # ADD A CONFIGURATION From fa8fd46faedf0e87ffaf2bd47d2403c5d98f23aa Mon Sep 17 00:00:00 2001 From: lapineige Date: Sat, 18 Feb 2023 20:22:52 +0100 Subject: [PATCH 05/13] fix chmod syntax --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index 226cda40..8963898b 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -152,7 +152,7 @@ chmod 750 "$final_path" chmod -R o-rwx "$final_path" chown -R $app:www-data "$final_path" # Pixelfed app should be able to edit its settings from the admin panel -chmod 600 "$final_path"/.env +chmod -R 600 "$final_path"/.env #================================================= # UPGRADE DEPENDENCIES From 68924109ba0abfe5a4edaa2f37fc94ea95fb9985 Mon Sep 17 00:00:00 2001 From: lapineige Date: Sat, 18 Feb 2023 20:26:15 +0100 Subject: [PATCH 06/13] fix chmod syntax + remove typo --- scripts/upgrade | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 8963898b..edcd7edd 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -152,7 +152,7 @@ chmod 750 "$final_path" chmod -R o-rwx "$final_path" chown -R $app:www-data "$final_path" # Pixelfed app should be able to edit its settings from the admin panel -chmod -R 600 "$final_path"/.env +chmod 600 "$final_path"/.env #================================================= # UPGRADE DEPENDENCIES @@ -223,7 +223,7 @@ ynh_script_progression --message="Creating log file..." --weight=1 mkdir -p "/var/log/$app/" touch "/var/log/$app/${app}-horizon.log" chown -R $app: "/var/log/$app/" -chmod 600 $app: "/var/log/$app/" +chmod -R 600 $app: "/var/log/$app/" #================================================= # UPGRADE THE CRON FILE From d05e4cd498aedc948ceddd867c46224a97573930 Mon Sep 17 00:00:00 2001 From: tituspijean Date: Thu, 23 Feb 2023 23:39:28 +0100 Subject: [PATCH 07/13] [autopatch] Upgrade auto-updater --- .github/workflows/updater.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/updater.yml b/.github/workflows/updater.yml index 5f1dcc17..08ec1b3a 100644 --- a/.github/workflows/updater.yml +++ b/.github/workflows/updater.yml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Fetch the source code - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: token: ${{ secrets.GITHUB_TOKEN }} - name: Run the updater script @@ -33,7 +33,7 @@ jobs: - name: Create Pull Request id: cpr if: ${{ env.PROCEED == 'true' }} - uses: peter-evans/create-pull-request@v3 + uses: peter-evans/create-pull-request@v4 with: token: ${{ secrets.GITHUB_TOKEN }} commit-message: Update to version ${{ env.VERSION }} From 9ed1441540aade26c0dd52942b7fc7caf48d44a1 Mon Sep 17 00:00:00 2001 From: lapineige Date: Fri, 17 Mar 2023 11:50:47 +0100 Subject: [PATCH 08/13] Fix redis config Related discussion #202 --- conf/.env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/.env b/conf/.env index 96261964..5b00f43c 100644 --- a/conf/.env +++ b/conf/.env @@ -71,7 +71,7 @@ DB_USERNAME=__DB_USER__ DB_PASSWORD=__DB_PWD__ ## Cache (Redis) -REDIS_CLIENT=predis +REDIS_CLIENT=phpredis REDIS_SCHEME=tcp REDIS_HOST=127.0.0.1 REDIS_PASSWORD=null From 48d9ccbe5a0ecd692fbbf869cd0f9d04a6f0d7f0 Mon Sep 17 00:00:00 2001 From: lapineige Date: Fri, 17 Mar 2023 11:51:08 +0100 Subject: [PATCH 09/13] Bump version --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 68c7cafc..a84de1ac 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.4~ynh4", + "version": "0.11.4~ynh5", "url": "https://pixelfed.org/", "upstream": { "license": "AGPL-3.0-or-later", From f80fc92f3f7fc607d2f3cdc0a878f1d552425a2c Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 17 Mar 2023 10:51:12 +0000 Subject: [PATCH 10/13] 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 aa14331d..73bd6a7a 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.4~ynh4 +**Shipped version:** 0.11.4~ynh5 ## Screenshots diff --git a/README_fr.md b/README_fr.md index a0da2b33..42232201 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.4~ynh4 +**Version incluse :** 0.11.4~ynh5 ## Captures d’écran From 0e44a92dfad34ec317ffaf47afee1847f68319ea Mon Sep 17 00:00:00 2001 From: lapineige Date: Fri, 17 Mar 2023 16:52:35 +0100 Subject: [PATCH 11/13] Add logrotate for laravel.log Fix #199 --- scripts/install | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/install b/scripts/install index 3ece026e..8f8897c3 100644 --- a/scripts/install +++ b/scripts/install @@ -195,6 +195,7 @@ ynh_script_progression --message="Configuring log rotation..." --weight=1 # Use logrotate to manage application logfile(s) ynh_use_logrotate --logfile="/var/log/$app/${app}-horizon.log" +ynh_use_logrotate --logfile="/var/www/$app/storage/logs/laravel.log" #================================================= # INTEGRATE SERVICE IN YUNOHOST From d4be397110f9d2ebcae92a105814ad060229dfc9 Mon Sep 17 00:00:00 2001 From: lapineige Date: Sat, 25 Mar 2023 15:31:11 +0100 Subject: [PATCH 12/13] fix syntax --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 8f8897c3..a1629b34 100644 --- a/scripts/install +++ b/scripts/install @@ -135,7 +135,7 @@ ynh_script_progression --message="Creating log file..." --weight=1 mkdir -p "/var/log/$app/" touch "/var/log/$app/${app}-horizon.log" chown -R $app: "/var/log/$app/" -chmod -R 600 $app: "/var/log/$app/" +chmod -R 600 "/var/log/$app/" #================================================= # ADD A CONFIGURATION From 736156df7be69cffad6a23e2965310cb4f1a33f2 Mon Sep 17 00:00:00 2001 From: lapineige Date: Sat, 25 Mar 2023 15:31:59 +0100 Subject: [PATCH 13/13] fix chmod syntax --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index edcd7edd..c2254f3d 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -223,7 +223,7 @@ ynh_script_progression --message="Creating log file..." --weight=1 mkdir -p "/var/log/$app/" touch "/var/log/$app/${app}-horizon.log" chown -R $app: "/var/log/$app/" -chmod -R 600 $app: "/var/log/$app/" +chmod -R 600 "/var/log/$app/" #================================================= # UPGRADE THE CRON FILE