Revert "Attempt to fix CI building wrong commits (#3830)"

[lemmy.git] / config / defaults.hjson

diff --git a/config/defaults.hjson b/config/defaults.hjson
index e92117787e674a0d51e541a51d594726e7487a70..1e5597a1172ffebfdff4494cc0b952d8fa231542 100644 (file)
--- a/config/defaults.hjson
+++ b/config/defaults.hjson
@@ -1,16 +1,38 @@
 {
   # 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
   }
@@ -18,7 +40,7 @@
   # 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"
   }
@@ -30,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"
@@ -54,4 +76,12 @@
   port: 8536
   # Whether the site is available over TLS. Needs to be true for federation to work.
   tls_enabled: true
+  # 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
+  prometheus: {
+    bind: "127.0.0.1"
+    port: 10002
+  }
 }