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

diff --git a/docker/lemmy.hjson b/docker/lemmy.hjson
index c8dd2818aba35f1633bfd28d6a451ab93d3e4faa..89da46891364e07efa3cc23614abbda26462b299 100644 (file)
--- 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 8b5239238c05572a14062252f992bad64fcb3a4f..cc421b0b778a61f5f7d0931bc34abb272f0dd942 100644 (file)
--- 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](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 
-`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