From: Dessalines <tyhou13@gmx.com>
Date: Sat, 27 Jun 2020 14:54:08 +0000 (-0400)
Subject: Merge branch 'master' into federation
X-Git-Url: http://these/git/%22https:/www.exeterceilidhs.net/%7B%60%24%7BwebArchiveUrl%7D/save/static/git-logo.png?a=commitdiff_plain;h=e517de5480d07e80fdad545a9eb182198421ac06;p=lemmy.git

Merge branch 'master' into federation
---

e517de5480d07e80fdad545a9eb182198421ac06
diff --cc server/config/defaults.hjson
index 61951321,482a7208..348368f1
--- a/server/config/defaults.hjson
+++ b/server/config/defaults.hjson
@@@ -33,8 -33,11 +33,8 @@@
    port: 8536
    # json web token for authorization between server and client
    jwt_secret: "changeme"
-   # The dir for the front end
+   # The location of the frontend
    front_end_dir: "../ui/dist"
 -  # whether to enable activitypub federation. this feature is in alpha, do not enable in production, as might
 -  # cause problems like remote instances fetching and permanently storing bad data.
 -  federation_enabled: false
    # rate limits for various user actions, by user ip
    rate_limit: {
      # maximum number of messages created in interval
@@@ -50,18 -53,9 +50,18 @@@
      # interval length for registration limit
      register_per_second: 3600
    }
 +  # settings related to activitypub federation
 +  federation: {
 +    # whether to enable activitypub federation. this feature is in alpha, do not enable in production.
 +    enabled: false
 +    # whether tls is required for activitypub. only disable this for debugging, never for producion.
 +    tls_enabled: true
 +    # comma seperated list of instances with which federation is allowed
 +    allowed_instances: ""
 +  }
  #  # email sending configuration
  #  email: {
- #    # hostname of the smtp server
+ #    # hostname and port of the smtp server
  #    smtp_server: ""
  #    # login name for smtp server
  #    smtp_login: ""