From 67e4936034dfc9503e6fa0b030776f8d0f235308 Mon Sep 17 00:00:00 2001 From: lapineige Date: Tue, 14 Feb 2023 21:05:41 +0100 Subject: [PATCH 01/10] Update manifest.json --- 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 3b489797365754f62add65a1cd5855e80020ebce Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 14 Feb 2023 20:05:44 +0000 Subject: [PATCH 02/10] Auto-update README --- README.md | 5 +++-- README_fr.md | 23 ++++++++++++----------- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index 3b36507a..73bd6a7a 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)* @@ -24,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 db1f684f..42232201 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: @@ -25,11 +26,11 @@ 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 +## 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 e187daebe2409d1ac76615e2f42bcd33986623f5 Mon Sep 17 00:00:00 2001 From: lapineige Date: Fri, 17 Mar 2023 16:50:51 +0100 Subject: [PATCH 03/10] Add logrotate for lavarel.log Fix #199 --- scripts/install | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/install b/scripts/install index cf94b71f..03eb4bc2 100644 --- a/scripts/install +++ b/scripts/install @@ -194,6 +194,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 c090969d40a9955b4df5b48032b187f4b242cd64 Mon Sep 17 00:00:00 2001 From: lapineige Date: Fri, 17 Mar 2023 16:51:59 +0100 Subject: [PATCH 04/10] revert --- scripts/install | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/install b/scripts/install index 03eb4bc2..cf94b71f 100644 --- a/scripts/install +++ b/scripts/install @@ -194,7 +194,6 @@ 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 10dc52543659d61414b54cce977e49ca09cc42dd Mon Sep 17 00:00:00 2001 From: lapineige Date: Wed, 3 May 2023 20:59:18 +0200 Subject: [PATCH 05/10] Update DISCLAIMER_fr.md php8.2 --- doc/DISCLAIMER_fr.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/DISCLAIMER_fr.md b/doc/DISCLAIMER_fr.md index 05427d14..bb42a451 100644 --- a/doc/DISCLAIMER_fr.md +++ b/doc/DISCLAIMER_fr.md @@ -8,7 +8,7 @@ Après avoir été enregistré pour la première fois, vous devez exécuter la c **Entrez la commande:** - $ php8.0 /var/www/pixelfed/artisan user:admin 1 + $ php8.2 /var/www/pixelfed/artisan user:admin 1 et répondez oui à la question « Ajouter des privilèges d'administrateur à cet utilisateur ? » From d3e48f4101cc343ba537d48bd6d6a9c5a4291cd2 Mon Sep 17 00:00:00 2001 From: lapineige Date: Wed, 3 May 2023 20:59:19 +0200 Subject: [PATCH 06/10] Update DISCLAIMER.md php8.2 --- doc/DISCLAIMER.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/DISCLAIMER.md b/doc/DISCLAIMER.md index 20ec496a..9643267e 100644 --- a/doc/DISCLAIMER.md +++ b/doc/DISCLAIMER.md @@ -8,7 +8,7 @@ After being first registered, you need to execute the folloing command to promot **Run:** - $ sudo php8.0 /var/www/pixelfed/artisan user:admin 1 + $ sudo php8.2 /var/www/pixelfed/artisan user:admin 1 and respond yes to the question ` Add admin privileges to this user?`. From 780318ddd1e81bedbe4b9fca3314c678a32bc2a7 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 3 May 2023 18:59:22 +0000 Subject: [PATCH 07/10] 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..f2773b32 100644 --- a/README.md +++ b/README.md @@ -43,7 +43,7 @@ After being first registered, you need to execute the folloing command to promot **Run:** - $ sudo php8.0 /var/www/pixelfed/artisan user:admin 1 + $ sudo php8.2 /var/www/pixelfed/artisan user:admin 1 and respond yes to the question ` Add admin privileges to this user?`. diff --git a/README_fr.md b/README_fr.md index 795db7c2..544d9d48 100644 --- a/README_fr.md +++ b/README_fr.md @@ -44,7 +44,7 @@ Après avoir été enregistré pour la première fois, vous devez exécuter la c **Entrez la commande:** - $ php8.0 /var/www/pixelfed/artisan user:admin 1 + $ php8.2 /var/www/pixelfed/artisan user:admin 1 et répondez oui à la question « Ajouter des privilèges d'administrateur à cet utilisateur ? » From 9e6e551c843093d46a144e88c154eb67c5e6a35c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 26 May 2023 10:08:28 +0200 Subject: [PATCH 08/10] Update .env --- conf/.env | 178 +++++++++++++++++------------------------------------- 1 file changed, 56 insertions(+), 122 deletions(-) diff --git a/conf/.env b/conf/.env index 71627f31..808f5d46 100644 --- a/conf/.env +++ b/conf/.env @@ -1,145 +1,79 @@ -## Crypto +APP_NAME="__APP__" +APP_ENV="production" APP_KEY=__APP_KEY__ +APP_DEBUG="false" -## General Settings -APP_NAME=__APP__ -APP_ENV=production -APP_DEBUG=false -APP_URL=https://__DOMAIN__ -ADMIN_DOMAIN="__DOMAIN__" +# Instance Configuration +OPEN_REGISTRATION="false" +ENFORCE_EMAIL_VERIFICATION="false" +PF_MAX_USERS="1000" +OAUTH_ENABLED="true" + +# Media Configuration +PF_OPTIMIZE_IMAGES="true" +IMAGE_QUALITY="80" +MAX_PHOTO_SIZE="15000" +MAX_CAPTION_LENGTH="500" +MAX_ALBUM_LENGTH="4" + +# Instance URL Configuration +APP_URL="https://__DOMAIN__ APP_DOMAIN="__DOMAIN__" +ADMIN_DOMAIN="__DOMAIN__" SESSION_DOMAIN="${APP_DOMAIN}" +TRUST_PROXIES="*" -OPEN_REGISTRATION=true -ENFORCE_EMAIL_VERIFICATION=true -PF_MAX_USERS=1000 -OAUTH_ENABLED=true +# Database Configuration +DB_CONNECTION="pgsql" +DB_HOST="127.0.0.1" +DB_PORT="5432" +DB_DATABASE="__DB_NAME__" +DB_USERNAME="__DB_USER__" +DB_PASSWORD="__DB_PWD__" -APP_TIMEZONE=UTC -APP_LOCALE=en +# Redis Configuration +REDIS_CLIENT="phpredis" +REDIS_SCHEME="tcp" +REDIS_HOST="127.0.0.1" +REDIS_PASSWORD="null" +REDIS_PORT="6379" +REDIS_DATABASE="__REDIS_DB__" -## Pixelfed Tweaks -LIMIT_ACCOUNT_SIZE=true -MAX_ACCOUNT_SIZE=1000000 -MAX_PHOTO_SIZE=15000 -MAX_AVATAR_SIZE=2000 -MAX_CAPTION_LENGTH=500 -MAX_BIO_LENGTH=125 -MAX_NAME_LENGTH=30 -MAX_ALBUM_LENGTH=4 -IMAGE_QUALITY=80 -PF_OPTIMIZE_IMAGES=true -PF_OPTIMIZE_VIDEOS=true -ADMIN_ENV_EDITOR=true -ACCOUNT_DELETION=true -ACCOUNT_DELETE_AFTER=false -MAX_LINKS_PER_POST=0 +# Laravel Configuration +SESSION_DRIVER="database" +CACHE_DRIVER="redis" +QUEUE_DRIVER="redis" +BROADCAST_DRIVER="log" +LOG_CHANNEL="stack" +HORIZON_PREFIX="horizon-" -## Instance -#INSTANCE_DESCRIPTION= -INSTANCE_PUBLIC_HASHTAGS=false -#INSTANCE_CONTACT_EMAIL= -INSTANCE_PUBLIC_LOCAL_TIMELINE=false -#BANNED_USERNAMES= -STORIES_ENABLED=false -RESTRICTED_INSTANCE=false +# ActivityPub Configuration +ACTIVITY_PUB="true" +AP_REMOTE_FOLLOW="true" +AP_INBOX="true" +AP_OUTBOX="true" +AP_SHAREDINBOX="true" -## Mail +# Experimental Configuration +EXP_EMC="true" + +## Mail Configuration (Post-Installer) MAIL_DRIVER=smtp MAIL_HOST=localhost MAIL_PORT=25 -MAIL_FROM_ADDRESS="pixelfed@__DOMAIN__" -MAIL_FROM_NAME="Pixelfed" MAIL_USERNAME=null MAIL_PASSWORD=null MAIL_ENCRYPTION=null +MAIL_FROM_ADDRESS="pixelfed@__DOMAIN__" +MAIL_FROM_NAME="Pixelfed" -## Databases (MySQL) -#DB_CONNECTION=mysql -#DB_HOST=127.0.0.1 -#DB_PORT=3306 -#DB_DATABASE=pixelfed -#DB_USERNAME=pixelfed -#DB_PASSWORD=pixelfed - -## Databases (Postgres) -DB_CONNECTION=pgsql -DB_HOST=127.0.0.1 -DB_PORT=5432 -DB_DATABASE=__DB_NAME__ -DB_USERNAME=__DB_USER__ -DB_PASSWORD=__DB_PWD__ - -## Cache (Redis) -REDIS_CLIENT=phpredis -REDIS_SCHEME=tcp -REDIS_HOST=127.0.0.1 -REDIS_PASSWORD=null -REDIS_PORT=6379 -REDIS_DATABASE=__REDIS_DB__ - -## EXPERIMENTS -EXP_LC=false -EXP_REC=false -EXP_LOOPS=false - -## ActivityPub Federation -ACTIVITY_PUB=true -AP_REMOTE_FOLLOW=true -AP_INBOX=true -AP_SHAREDINBOX=true -AP_OUTBOX=true -ATOM_FEEDS=true -NODEINFO=true -WEBFINGER=true - -## S3 -FILESYSTEM_CLOUD=s3 +## S3 Configuration (Post-Installer) PF_ENABLE_CLOUD=false +FILESYSTEM_CLOUD=s3 #AWS_ACCESS_KEY_ID= #AWS_SECRET_ACCESS_KEY= #AWS_DEFAULT_REGION= -#AWS_BUCKET= +#AWS_BUCKET= #AWS_URL= #AWS_ENDPOINT= #AWS_USE_PATH_STYLE_ENDPOINT=false - -## Horizon -HORIZON_DARKMODE=false - -## COSTAR - Confirm Object Sentiment Transform and Reduce -PF_COSTAR_ENABLED=true -CS_BLOCKED_DOMAINS='gab.com,gab.ai,develop.gab.com' -CS_CW_DOMAINS='switter.at' -CS_UNLISTED_DOMAINS='example.org,example.net,example.com' - -# Media -MEDIA_EXIF_DATABASE=false - -## Logging -LOG_CHANNEL=stack - -## Image -IMAGE_DRIVER=imagick - -## Broadcasting -BROADCAST_DRIVER=log # log driver for local development - -## Cache -CACHE_DRIVER=redis - -## Purify -RESTRICT_HTML_TYPES=true - -## Queue -QUEUE_DRIVER=redis - -## Session -SESSION_DRIVER=redis - -## Trusted Proxy -TRUST_PROXIES="*" - -## Passport -#PASSPORT_PRIVATE_KEY= -#PASSPORT_PUBLIC_KEY= From a459729bf6270eceb59e20dd5cf1bf9d7ccc259e Mon Sep 17 00:00:00 2001 From: lapineige Date: Mon, 29 May 2023 15:07:08 +0200 Subject: [PATCH 09/10] Testing : post editing (v0.11.8) (#218) * v0.11.8 * v0.11.8 * Auto-update README --- README.md | 2 +- README_fr.md | 2 +- conf/app.src | 4 ++-- manifest.json | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index e7f6ab26..e8bd0a93 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.7~ynh1 +**Shipped version:** 0.11.8~ynh1 ## Screenshots diff --git a/README_fr.md b/README_fr.md index 88766104..5196572b 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.7~ynh1 +**Version incluse :** 0.11.8~ynh1 ## Captures d’écran diff --git a/conf/app.src b/conf/app.src index 821e92a5..269f7aee 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.7.tar.gz -SOURCE_SUM=eb27aa61c337c3dbca3c0e59cbd86069da1dbc7dea988630d3453cd92dcc75e7 +SOURCE_URL=https://github.com/pixelfed/pixelfed/archive/refs/tags/v0.11.8.tar.gz +SOURCE_SUM=cf98d50225dd83d612bc16d2b0eb0415f09e74413e28795c4d320fda029aa1ff SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index a57868d6..fe42661e 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.7~ynh1", + "version": "0.11.8~ynh1", "url": "https://pixelfed.org/", "upstream": { "license": "AGPL-3.0-or-later", From 27b47824e38ca52b8e50a699e8d650648588fe5b Mon Sep 17 00:00:00 2001 From: Tagada <36127788+Tagadda@users.noreply.github.com> Date: Mon, 29 May 2023 22:11:25 +0200 Subject: [PATCH 10/10] Fix .env --- conf/.env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/.env b/conf/.env index 808f5d46..018e1943 100644 --- a/conf/.env +++ b/conf/.env @@ -17,7 +17,7 @@ MAX_CAPTION_LENGTH="500" MAX_ALBUM_LENGTH="4" # Instance URL Configuration -APP_URL="https://__DOMAIN__ +APP_URL=https://__DOMAIN__ APP_DOMAIN="__DOMAIN__" ADMIN_DOMAIN="__DOMAIN__" SESSION_DOMAIN="${APP_DOMAIN}"