grishka/lemmy
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'main' into move_views_to_diesel

Browse source
This commit is contained in:
Dessalines 2020-12-08 13:31:25 -05:00
commit 742b78523a
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
docs/src/administration/administration.md
View file

@ -4,8 +4,8 @@ Information for Lemmy instance admins, and those who want to run a server.
## Install ## Install
Lemmy has two primary install methods, [docker](install_docker.md), and [ansible](install_ansible.md). Ansible simplifies deploying to a remote server, while docker is best for local testing. Lemmy has two primary installation methods, [manually with Docker](install_docker.md), and [automated with Ansible](install_ansible.md). We recommend using Ansible, because it simplifies the installation and also makes updating easier.
### Manual install ### Manual install (without Docker)
Manual installs are *possible*, but not preferred, since Lemmy is dependent on other local services: The [lemmy-ui](https://github.com/LemmyNet/lemmy-ui), [a Postgresql Database](https://www.postgresql.org/), [pict-rs](https://git.asonix.dog/asonix/pict-rs/) for images, and [iframely](https://iframely.com/) for embeds. To see how these are wired together, look at the docker-compose.yml files. Due to the complexity of different systems, we will not support manual installs. Manual installs are *possible*, but not preferred, since Lemmy is dependent on other local services: The [lemmy-ui](https://github.com/LemmyNet/lemmy-ui), [a Postgresql Database](https://www.postgresql.org/), [pict-rs](https://git.asonix.dog/asonix/pict-rs/) for images, and [iframely](https://iframely.com/) for embeds. To see how these are wired together, look at the docker-compose.yml files. Due to the complexity of different systems, we will not support manual installs.

2
docs/src/federation/federation.md
View file

@ -12,3 +12,5 @@ One way you can take advantage of federation is by opening a different instance,
- `https://lemmy.ml/u/nutomic` (User) - `https://lemmy.ml/u/nutomic` (User)
- `https://lemmy.ml/post/123` (Post) - `https://lemmy.ml/post/123` (Post)
- `https://lemmy.ml/comment/321` (Comment) - `https://lemmy.ml/comment/321` (Comment)
You can see the list of linked instances by following the "Instances" link at the bottom of any Lemmy page.