mirrors/lemmy
1
0
Fork 0
mirror of https://github.com/LemmyNet/lemmy.git synced 2024-11-26 19:31:05 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'improve-config' of https://yerbamate.dev/LemmyNet/lemmy into improve-config

Browse source
This commit is contained in:
Dessalines 2020-06-27 10:08:09 -04:00
commit b6fc1959e6
2 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
docker/lemmy.hjson vendored
View file

@ -20,9 +20,9 @@
password: "password" password: "password"
# host where postgres is running # host where postgres is running
host: "postgres" host: "postgres"
# port where postgres can be accessed
port: 5432
} }
# The location of the frontend
front_end_dir: "/app/dist"
# # optional: email sending configuration # # optional: email sending configuration
# email: { # email: {
# # hostname of the smtp server # # hostname of the smtp server

17
docs/src/administration_configuration.md vendored
View file

@ -1,13 +1,20 @@
# Configuration # Configuration
The configuration is based on the file [defaults.hjson](https://raw.githubusercontent.com/LemmyNet/lemmy/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. 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 Additionally, you can override any config files with environment variables. These have the same
`LEMMY__DATABASE__POOL_SIZE=10`. 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 ```bash
cd server cd server