From a9d98fd09bc8cc337266c55a6f2a8e58a421d9aa Mon Sep 17 00:00:00 2001 From: Felix Ableitner Date: Wed, 24 Jun 2020 16:09:52 +0200 Subject: Improve config files by adding documentation and removing some fields --- docker/lemmy.hjson | 55 +++++++++++++++--------------------------------------- 1 file changed, 15 insertions(+), 40 deletions(-) (limited to 'docker') diff --git a/docker/lemmy.hjson b/docker/lemmy.hjson index 271fc78d..c8dd2818 100644 --- a/docker/lemmy.hjson +++ b/docker/lemmy.hjson @@ -1,5 +1,19 @@ { + # for more info about the config, check out the documentation + # https://dev.lemmy.ml/docs/administration_configuration.html + + # the domain name of your instance (eg "dev.lemmy.ml") + hostname: "my_domain" + # address where lemmy should listen for incoming requests + bind: "0.0.0.0" + # port where lemmy should listen for incoming requests + port: 8536 + # json web token for authorization between server and client + jwt_secret: "changeme" + # settings related to the postgresql database database: { + # name of the postgres database for lemmy + database: "lemmy" # username to connect to postgres user: "lemmy" # password to connect to postgres @@ -8,45 +22,7 @@ host: "postgres" # port where postgres can be accessed port: 5432 - # name of the postgres database for lemmy - database: "lemmy" - # maximum number of active sql connections - pool_size: 5 } - # the domain name of your instance (eg "dev.lemmy.ml") - hostname: "my_domain" - # address where lemmy should listen for incoming requests - bind: "0.0.0.0" - # port where lemmy should listen for incoming requests - port: 8536 - # json web token for authorization between server and client - jwt_secret: "changeme" - # The dir for the front end - front_end_dir: "/app/dist" - # rate limits for various user actions, by user ip - rate_limit: { - # maximum number of messages created in interval - message: 180 - # interval length for message limit - message_per_second: 60 - # maximum number of posts created in interval - post: 6 - # interval length for post limit - post_per_second: 600 - # maximum number of registrations in interval - register: 3 - # interval length for registration limit - register_per_second: 3600 - } -# # optional: parameters for automatic configuration of new instance (only used at first start) -# setup: { -# # username for the admin user -# admin_username: "lemmy" -# # password for the admin user -# admin_password: "lemmy" -# # name of the site (can be changed later) -# site_name: "Lemmy Test" -# } # # optional: email sending configuration # email: { # # hostname of the smtp server @@ -55,9 +31,8 @@ # smtp_login: "" # # password to login to the smtp server # smtp_password: "" -# # address to send emails from, eg "info@your-instance.com" +# # address to send emails from, eg "noreply@your-instance.com" # smtp_from_address: "" -# use_tls: true # } } -- cgit v1.2.3 From 6e736e1f1e5ba9103d67bdb479fa58417a25d0cb Mon Sep 17 00:00:00 2001 From: Dessalines Date: Wed, 24 Jun 2020 13:29:44 -0400 Subject: Version v0.7.1 --- docker/prod/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docker') diff --git a/docker/prod/docker-compose.yml b/docker/prod/docker-compose.yml index e2774d64..c3ae8554 100644 --- a/docker/prod/docker-compose.yml +++ b/docker/prod/docker-compose.yml @@ -12,7 +12,7 @@ services: restart: always lemmy: - image: dessalines/lemmy:v0.7.0 + image: dessalines/lemmy:v0.7.1 ports: - "127.0.0.1:8536:8536" restart: always -- cgit v1.2.3 From 0c89de8065f7eada7f7d2e6b5d988fd15a250c6c Mon Sep 17 00:00:00 2001 From: Felix Ableitner Date: Fri, 26 Jun 2020 19:16:41 +0200 Subject: Fix previous comment, also fix link in docs --- docker/lemmy.hjson | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'docker') diff --git a/docker/lemmy.hjson b/docker/lemmy.hjson index c8dd2818..89da4689 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 -- cgit v1.2.3 From da2bb724e9ab631410df7bfe550c57ecb350de56 Mon Sep 17 00:00:00 2001 From: Dessalines Date: Sat, 27 Jun 2020 09:28:28 -0400 Subject: Version v0.7.2 --- docker/prod/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docker') diff --git a/docker/prod/docker-compose.yml b/docker/prod/docker-compose.yml index c3ae8554..ef3d6975 100644 --- a/docker/prod/docker-compose.yml +++ b/docker/prod/docker-compose.yml @@ -12,7 +12,7 @@ services: restart: always lemmy: - image: dessalines/lemmy:v0.7.1 + image: dessalines/lemmy:v0.7.2 ports: - "127.0.0.1:8536:8536" restart: always -- cgit v1.2.3