Merge branch 'develop' into issue/1280

[akkoma] / priv / templates / sample_config.eex

diff --git a/priv/templates/sample_config.eex b/priv/templates/sample_config.eex
index ca9c7a2c28735a6282522994220e722108a12d6b..bc7e37375bf1cd0c5b34e41a14a11ada1090cb38 100644 (file)
--- a/priv/templates/sample_config.eex
+++ b/priv/templates/sample_config.eex
@@ -20,8 +20,7 @@ config :pleroma, :instance,
   email: "<%= email %>",
   notify_email: "<%= notify_email %>",
   limit: 5000,
-  registrations_open: true,
-  dynamic_configuration: <%= db_configurable? %>
+  registrations_open: true
 
 config :pleroma, :media_proxy,
   enabled: false,
@@ -68,3 +67,7 @@ config :pleroma, Pleroma.Uploaders.Local, uploads: "<%= uploads_dir %>"
 # For using third-party S3 clones like wasabi, also do:
 # config :ex_aws, :s3,
 #   host: "s3.wasabisys.com"
+
+config :joken, default_signer: "<%= jwt_secret %>"
+
+config :pleroma, configurable_from_database: <%= db_configurable? %>