From 1e7c3841b2f3fd7f46b1fda3faeecca1c312bc1a Mon Sep 17 00:00:00 2001 From: Felix Date: Tue, 21 Apr 2020 13:24:08 +0200 Subject: [PATCH] Update federation dev instructions --- .../contributing_federation_development.md | 35 +++++++++++++++---- 1 file changed, 29 insertions(+), 6 deletions(-) diff --git a/docs/src/contributing_federation_development.md b/docs/src/contributing_federation_development.md index 13a047d0..bcac4caa 100644 --- a/docs/src/contributing_federation_development.md +++ b/docs/src/contributing_federation_development.md @@ -5,17 +5,17 @@ If you don't have a local clone of the Lemmy repo yet, just run the following command: ```bash -git clone https://yerbamate.dev/nutomic/lemmy.git -b federation +git clone https://yerbamate.dev/LemmyNet/lemmy.git -b federation ``` If you already have the Lemmy repo cloned, you need to add a new remote: ```bash -git remote add federation https://yerbamate.dev/nutomic/lemmy.git +git remote add federation https://yerbamate.dev/LemmyNet/lemmy.git git checkout federation git pull federation federation ``` -## Running +## Running locally You need to have the following packages installed, the Docker service needs to be running. @@ -31,7 +31,30 @@ cd dev/federation-test ``` After the build is finished and the docker-compose setup is running, open [127.0.0.1:8540](http://127.0.0.1:8540) and -[127.0.0.1:8541](http://127.0.0.1:8541) in your browser to use the test instances. You can login as admin with -username `lemmy` and password `lemmy`, or create new accounts. +[127.0.0.1:8550](http://127.0.0.1:8550) in your browser to use the test instances. You can login as admin with +username `lemmy_alpha` and `lemmy_beta` respectively, with password `lemmy`. -Please get in touch if you want to contribute to this, so we can coordinate things and avoid duplicate work. \ No newline at end of file +## Running on a server + +Note that federation is currently in alpha. Only use it for testing, not on any production server, and be aware +that you might have to wipe the instance data at one point or another. + +Follow the normal installation instructions, either with [Ansible](administration_install_ansible.md) or +[manually](administration_install_docker.md). Then replace the line `image: dessalines/lemmy:v0.x.x` in +`/lemmy/docker-compose.yml` with `image: dessalines/lemmy:federation`. Also add the following in +`/lemmy/lemmy.hjson`: + +``` + federation: { + enabled: true + instance_whitelist: example.com + } +``` + +Afterwards, and whenver you want to update to the latest version, run these commands on the server: + +``` +cd /lemmy/ +sudo docker-compose pull +sudo docker-compose up -d +``` -- 2.44.1