X-Git-Url: http://these/git/?a=blobdiff_plain;f=docker%2Flemmy.hjson;h=f7ffcc1e3d0ed52ff11387db3609d8fea39a7a14;hb=HEAD;hp=bceb5f6cd46265e90c3ca8ae8d86bd61222ecdfa;hpb=462c4a29544702885a34f335ed8fe8f59d29acf4;p=lemmy.git

diff --git a/docker/lemmy.hjson b/docker/lemmy.hjson
index bceb5f6c..f7ffcc1e 100644
--- a/docker/lemmy.hjson
+++ b/docker/lemmy.hjson
@@ -1,51 +1,27 @@
 {
   # for more info about the config, check out the documentation
-  # https://join.lemmy.ml/docs/en/administration/configuration.html
+  # https://join-lemmy.org/docs/en/administration/configuration.html
+
+  # This is a minimal lemmy config for the dev / main branch. Do not use for a 
+  # release / stable version.
 
   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"
+    admin_password: "lemmylemmy"
+    site_name: "lemmy-dev"
+  }
+  database: {
+    host: postgres
   }
 
-  # the domain name of your instance (eg "lemmy.ml")
-  hostname: "my_domain"
-  # address where lemmy should listen for incoming requests
+  hostname: "localhost"
   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
-    password: "password"
-    # host where postgres is running
-    host: "postgres"
-    # port where postgres can be accessed
-    port: 5432
-    # maximum number of active sql connections
-    pool_size: 5
+
+  pictrs: {
+    url: "http://pictrs:8080/"
+    # api_key: "API_KEY"
   }
-#  # optional: email sending configuration
-#  email: {
-#    # hostname and port of the smtp server
-#    smtp_server: ""
-#    # login name for smtp server
-#    smtp_login: ""
-#    # password to login to the smtp server
-#    smtp_password: ""
-#    # address to send emails from, eg "noreply@your-instance.com"
-#    smtp_from_address: ""
-#    # whether or not smtp connections should use tls
-#    use_tls: true
-#  }
-}
 
+  #opentelemetry_url: "http://otel:4137"
+}