From 0c89de8065f7eada7f7d2e6b5d988fd15a250c6c Mon Sep 17 00:00:00 2001 From: Felix Ableitner Date: Fri, 26 Jun 2020 19:16:41 +0200 Subject: [PATCH] Fix previous comment, also fix link in docs --- docker/lemmy.hjson | 4 ++-- docs/src/administration_configuration.md | 17 ++++++++++++----- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/docker/lemmy.hjson b/docker/lemmy.hjson index c8dd2818a..89da46891 100644 --- a/docker/lemmy.hjson +++ b/docker/lemmy.hjson @@ -20,9 +20,9 @@ password: "password" # host where postgres is running host: "postgres" - # port where postgres can be accessed - port: 5432 } + # The location of the frontend + front_end_dir: "/app/dist" # # optional: email sending configuration # email: { # # hostname of the smtp server diff --git a/docs/src/administration_configuration.md b/docs/src/administration_configuration.md index 8900ce8d5..cc421b0b7 100644 --- a/docs/src/administration_configuration.md +++ b/docs/src/administration_configuration.md @@ -1,13 +1,20 @@ # Configuration -The configuration is based on the file [defaults.hjson](server/config/defaults.hjson). This file also contains documentation for all the available options. To override the defaults, you can copy the options you want to change into your local `config.hjson` file. +The configuration is based on the file +[defaults.hjson](https://yerbamate.dev/LemmyNet/lemmy/src/branch/master/server/config/defaults.hjson). +This file also contains documentation for all the available options. To override the defaults, you +can copy the options you want to change into your local `config.hjson` file. -Additionally, you can override any config files with environment variables. These have the same name as the config options, and are prefixed with `LEMMY_`. For example, you can override the `database.password` with -`LEMMY__DATABASE__POOL_SIZE=10`. +Additionally, you can override any config files with environment variables. These have the same +name as the config options, and are prefixed with `LEMMY_`. For example, you can override the +`database.password` with `LEMMY__DATABASE__POOL_SIZE=10`. -An additional option `LEMMY_DATABASE_URL` is available, which can be used with a PostgreSQL connection string like `postgres://lemmy:password@lemmy_db:5432/lemmy`, passing all connection details at once. +An additional option `LEMMY_DATABASE_URL` is available, which can be used with a PostgreSQL +connection string like `postgres://lemmy:password@lemmy_db:5432/lemmy`, passing all connection +details at once. -If the Docker container is not used, manually create the database specified above by running the following commands: +If the Docker container is not used, manually create the database specified above by running the +following commands: ```bash cd server