Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags...

[akkoma] / priv / templates / sample_config.eex

diff --git a/priv/templates/sample_config.eex b/priv/templates/sample_config.eex
index dc75d4008e0ff631d54d9408dfbe952283c15cb6..2f5952ef18891ae57a6a583e7030112924b8ded6 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,
@@ -33,8 +32,7 @@ config :pleroma, Pleroma.Repo,
   username: "<%= dbuser %>",
   password: "<%= dbpass %>",
   database: "<%= dbname %>",
-  hostname: "<%= dbhost %>",
-  pool_size: 10
+  hostname: "<%= dbhost %>"
 
 # Configure web push notifications
 config :web_push_encryption, :vapid_details,
@@ -70,3 +68,9 @@ config :pleroma, Pleroma.Uploaders.Local, uploads: "<%= uploads_dir %>"
 #   host: "s3.wasabisys.com"
 
 config :joken, default_signer: "<%= jwt_secret %>"
+
+config :pleroma, configurable_from_database: <%= db_configurable? %>
+
+<%= if Kernel.length(upload_filters) > 0 do
+"config :pleroma, Pleroma.Upload, filters: #{inspect(upload_filters)}"
+end %>