Remove `actix_rt` & use standard tokio spawn (#3158)

[lemmy.git] / config / defaults.hjson

diff --git a/config/defaults.hjson b/config/defaults.hjson
index b4e1e3dfccb8e1f08e266331bd1c387519a9727e..6032f8fc9ae4520be514fa689e43e0f97eaec9a2 100644 (file)
--- a/config/defaults.hjson
+++ b/config/defaults.hjson
@@ -1,90 +1,49 @@
 {
   # settings related to the postgresql database
   database: {
+    # Configure the database by specifying a URI
+    # 
+    # This is the preferred method to specify database connection details since
+    # it is the most flexible.
+    # Connection URI pointing to a postgres instance
+    # 
+    # This example uses peer authentication to obviate the need for creating,
+    # configuring, and managing passwords.
+    # 
+    # For an explanation of how to use connection URIs, see [here][0] in
+    # PostgreSQL's documentation.
+    # 
+    # [0]: https://www.postgresql.org/docs/current/libpq-connect.html#id-1.7.3.8.3.6
+    uri: "postgresql:///lemmy?user=lemmy&host=/var/run/postgresql"
+
+    # or
+
+    # Configure the database by specifying parts of a URI
+    # 
+    # Note that specifying the `uri` field should be preferred since it provides
+    # greater control over how the connection is made. This merely exists for
+    # backwards-compatibility.
     # Username to connect to postgres
-    user: "lemmy"
+    user: "string"
     # Password to connect to postgres
-    password: "password"
+    password: "string"
     # Host where postgres is running
-    host: "localhost"
+    host: "string"
     # Port where postgres can be accessed
-    port: 5432
+    port: 123
     # Name of the postgres database for lemmy
-    database: "lemmy"
+    database: "string"
     # Maximum number of active sql connections
     pool_size: 5
   }
-  # 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, in seconds
-    message_per_second: 60
-    # Maximum number of posts created in interval
-    post: 6
-    # Interval length for post limit, in seconds
-    post_per_second: 600
-    # Maximum number of registrations in interval
-    register: 3
-    # Interval length for registration limit, in seconds
-    register_per_second: 3600
-    # Maximum number of image uploads in interval
-    image: 6
-    # Interval length for image uploads, in seconds
-    image_per_second: 3600
-    # Maximum number of comments created in interval
-    comment: 6
-    # Interval length for comment limit, in seconds
-    comment_per_second: 600
-    search: 60
-    # Interval length for search limit, in seconds
-    search_per_second: 600
-  }
   # Settings related to activitypub federation
-  federation: {
-    # Whether to enable activitypub federation.
-    enabled: false
-    # Allows and blocks are described here:
-    # https://join-lemmy.org/docs/en/administration/federation_getting_started.html
-    # 
-    # list of instances with which federation is allowed
-    allowed_instances: [
-      instance1.tld
-      instance2.tld
-      /* ... */
-    ]
-    # Instances which we never federate anything with (but previously federated objects are unaffected)
-    blocked_instances: [
-      string
-      /* ... */
-    ]
-    # If true, only federate with instances on the allowlist and block everything else. If false
-    # use allowlist only for remote communities, and posts/comments in local communities
-    # (meaning remote communities will show content from arbitrary instances).
-    strict_allowlist: true
-    # Maximum number of HTTP requests allowed to handle a single incoming activity (or a single object fetch through the search).
-    http_fetch_retry_limit: 25
-    # Number of workers for sending outgoing activities. Search logs for Activity queue stats to
-    # see information. If running number is consistently close to the worker_count, you should
-    # increase it.
-    worker_count: 64
-    # Use federation debug mode. Allows connecting to http and localhost urls. Also sends outgoing
-    # activities synchronously for easier testing. Do not use in production.
-    debug: false
-  }
   # Pictrs image server configuration.
   pictrs: {
     # Address where pictrs is available (for image hosting)
-    url: "http://pictrs:8080/"
+    url: "http://localhost:8080/"
     # Set a custom pictrs API key. ( Required for deleting images )
     api_key: "string"
   }
-  captcha: {
-    # Whether captcha is required for signup
-    enabled: false
-    # Can be easy, medium, or hard
-    difficulty: "medium"
-  }
   # Email sending configuration. All options except login/password are mandatory
   email: {
     # Hostname and port of the smtp server
@@ -93,7 +52,7 @@
     smtp_login: "string"
     # Password to login to the smtp server
     smtp_password: "string"
-    # Address to send emails from, eg noreply@your-instance.com
+    # Address to send emails from, eg "noreply@your-instance.com"
     smtp_from_address: "noreply@example.com"
     # Whether or not smtp connections should use tls. Can be none, tls, or starttls
     tls_type: "none"
@@ -117,8 +76,8 @@
   port: 8536
   # Whether the site is available over TLS. Needs to be true for federation to work.
   tls_enabled: true
-  # A regex list of slurs to block / hide
-  slur_filter: "(\bThis\b)|(\bis\b)|(\bsample\b)"
-  # Maximum length of local community and user names
-  actor_name_max_length: 20
+  # The number of activitypub federation workers that can be in-flight concurrently
+  worker_count: 0
+  # The number of activitypub federation retry workers that can be in-flight concurrently
+  retry_count: 0
 }