Merge develop

[akkoma] / lib / mix / tasks / pleroma / sample_config.eex

diff --git a/lib/mix/tasks/pleroma/sample_config.eex b/lib/mix/tasks/pleroma/sample_config.eex
index 59c2c4fba8df66fd467badc3eed123ab7f4938fd..ec7d8821e8342ac76dfd7b6a5a7425f44a24ca1a 100644 (file)
--- a/lib/mix/tasks/pleroma/sample_config.eex
+++ b/lib/mix/tasks/pleroma/sample_config.eex
@@ -7,15 +7,16 @@ use Mix.Config
 
 config :pleroma, Pleroma.Web.Endpoint,
    url: [host: "<%= domain %>", scheme: "https", port: <%= port %>],
-   secret_key_base: "<%= secret %>"
+   secret_key_base: "<%= secret %>",
+   signing_salt: "<%= signing_salt %>"
 
 config :pleroma, :instance,
   name: "<%= name %>",
   email: "<%= email %>",
+  notify_email: "<%= notify_email %>",
   limit: 5000,
   registrations_open: true,
-  dedupe_media: false,
-  max_pinned_statuses: 1
+  dedupe_media: false
 
 config :pleroma, :media_proxy,
   enabled: false,
@@ -76,3 +77,4 @@ config :web_push_encryption, :vapid_details,
 #  object_url: "https://cdn-endpoint.provider.com/<container>"
 #
 
+config :joken, default_signer: "<%= jwt_secret %>"