diff options
| author | tusooa <tusooa@kazv.moe> | 2022-07-31 21:32:49 +0000 |
|---|---|---|
| committer | tusooa <tusooa@kazv.moe> | 2022-07-31 21:32:49 +0000 |
| commit | c80096522cad1255f53e171359bc0266822c6441 (patch) | |
| tree | 102a7e13b2e4c11af54e14a9ab0b3be216ce6013 /config/config.exs | |
| parent | 9a27cb4f9d314fe1066f566de71357f55926116e (diff) | |
| parent | b5266097a1e73bd749d8176e327c14fcb9735f95 (diff) | |
| download | pleroma-c80096522cad1255f53e171359bc0266822c6441.tar.gz pleroma-c80096522cad1255f53e171359bc0266822c6441.zip | |
Merge branch 'develop' into 'from/develop/tusooa/emit-move'
# Conflicts:
# CHANGELOG.md
# test/pleroma/user_test.exs
Diffstat (limited to 'config/config.exs')
| -rw-r--r-- | config/config.exs | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/config/config.exs b/config/config.exs index 2bde5b826..0fc959807 100644 --- a/config/config.exs +++ b/config/config.exs @@ -149,8 +149,6 @@ config :pleroma, Pleroma.Web.Endpoint, ] # Configures Elixir's Logger -config :logger, truncate: 65536 - config :logger, :console, level: :debug, format: "\n$time $metadata[$level] $message\n", @@ -189,6 +187,7 @@ config :pleroma, :instance, email: "example@example.com", notify_email: "noreply@example.com", description: "Pleroma: An efficient and flexible fediverse server", + short_description: "", background_image: "/images/city.jpg", instance_thumbnail: "/instance/thumbnail.jpeg", limit: 5_000, @@ -258,7 +257,11 @@ config :pleroma, :instance, show_reactions: true, password_reset_token_validity: 60 * 60 * 24, profile_directory: true, - privileged_staff: false + privileged_staff: false, + max_endorsed_users: 20, + birthday_required: false, + birthday_min_age: 0, + max_media_attachments: 1_000 config :pleroma, :welcome, direct_message: [ @@ -856,13 +859,6 @@ config :pleroma, ConcurrentLimiter, [ {Pleroma.Web.ActivityPub.MRF.MediaProxyWarmingPolicy, [max_running: 5, max_waiting: 5]} ] -config :pleroma, :telemetry, - slow_queries_logging: [ - enabled: false, - min_duration: 500_000, - exclude_sources: [nil, "oban_jobs"] - ] - # Import environment specific config. This must remain at the bottom # of this file so it overrides the configuration defined above. import_config "#{Mix.env()}.exs" |