From 872e8b6438178a446a7c919862c8dc0b7b5c7ac0 Mon Sep 17 00:00:00 2001 From: Albatroz Jeremias Date: Mon, 20 Jan 2020 18:13:51 +0000 Subject: [PATCH 1/3] add .env file so that it won't fail when generating APP_KEY --- docker-compose.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker-compose.yml b/docker-compose.yml index 9dc61f205..b0cfc8b19 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -33,6 +33,7 @@ services: volumes: - "app-storage:/var/www/storage" - "app-bootstrap:/var/www/bootstrap" + - "./.env:/var/www/.env" networks: - external - internal From 8cceaa042d05abf8c1ac02e6ee4489d842dae6ba Mon Sep 17 00:00:00 2001 From: Albatroz Jeremias Date: Mon, 20 Jan 2020 18:15:29 +0000 Subject: [PATCH 2/3] set correct hosts for docker --- .env.example.docker | 53 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 .env.example.docker diff --git a/.env.example.docker b/.env.example.docker new file mode 100644 index 000000000..f102446ab --- /dev/null +++ b/.env.example.docker @@ -0,0 +1,53 @@ +APP_NAME="Pixelfed Prod" +APP_ENV=production +APP_KEY= +APP_DEBUG=false + +APP_URL=http://localhost +APP_DOMAIN="localhost" +ADMIN_DOMAIN="localhost" +SESSION_DOMAIN="localhost" +SESSION_SECURE_COOKIE=true +TRUST_PROXIES="*" + +LOG_CHANNEL=stack + +DB_CONNECTION=mysql +DB_HOST=db +DB_PORT=3306 +DB_DATABASE=pixelfed +DB_USERNAME=pixelfed +DB_PASSWORD=pixelfed + +BROADCAST_DRIVER=log +CACHE_DRIVER=redis +SESSION_DRIVER=redis +QUEUE_DRIVER=redis + +REDIS_SCHEME=tcp +REDIS_HOST=redis +REDIS_PASSWORD=null +REDIS_PORT=6379 + +MAIL_DRIVER=log +MAIL_HOST=smtp.mailtrap.io +MAIL_PORT=2525 +MAIL_USERNAME=null +MAIL_PASSWORD=null +MAIL_ENCRYPTION=null +MAIL_FROM_ADDRESS="pixelfed@example.com" +MAIL_FROM_NAME="Pixelfed" + +OPEN_REGISTRATION=true +ENFORCE_EMAIL_VERIFICATION=true +PF_MAX_USERS=1000 + +MAX_PHOTO_SIZE=15000 +MAX_CAPTION_LENGTH=150 +MAX_ALBUM_LENGTH=4 + +ACTIVITY_PUB=false +AP_REMOTE_FOLLOW=false +AP_INBOX=false +PF_COSTAR_ENABLED=false + From a669602699265505742ddb0e2d18298d07405782 Mon Sep 17 00:00:00 2001 From: Stasiek Michalski Date: Tue, 21 Jan 2020 16:46:16 +0100 Subject: [PATCH 3/3] Include more and more specific communication methods --- README.md | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 8480ef4b2..d90161d9b 100644 --- a/README.md +++ b/README.md @@ -28,11 +28,19 @@ Pixelfed is open-sourced software licensed under the AGPL license. The ways you can communicate on the project are below. Before interacting, please read through the [Code Of Conduct](CODE_OF_CONDUCT.md). -* IRC: #pixelfed on irc.freenode.net ([#freenode_#pixelfed:matrix.org through -Matrix](https://matrix.to/#/#freenode_#pixelfed:matrix.org)) -* Project on Mastodon: [@pixelfed@mastodon.social](https://mastodon.social/@pixelfed) +* IRC: [#pixelfed](irc://chat.freenode.net/pixelfed) on irc.freenode.net +* Matrix: [#pixelfed:matrix.org](https://matrix.to/#/#pixelfed:matrix.org) +* Mastodon: [@pixelfed@mastodon.social](https://mastodon.social/@pixelfed) * E-mail: [hello@pixelfed.org](mailto:hello@pixelfed.org) +### Development + +For more development focused communication methods, please visit the following: + +* IRC: [#pixelfed-dev](irc://chat.freenode.net/pixelfed-dev) on irc.freenode.net +* Matrix: [#pixelfed-dev:matrix.org](https://matrix.to/#/#pixelfed-dev:matrix.org) +* Mastodon: [@pixeldev@mastodon.social](https://mastodon.social/@pixeldev) + ## Pixelfed Sponsors @@ -42,4 +50,4 @@ We would like to extend our thanks to the following sponsors for funding Pixelfe Discovery](https://nlnet.nl/discovery/), part of the [Next Generation Internet](https://ngi.eu) initiative. - [](https://oscillas.com/) -- Managed Pixelfed Hosting by [Spacebear](https://app.spacebear.ee/) \ No newline at end of file +- Managed Pixelfed Hosting by [Spacebear](https://app.spacebear.ee/)