Merge remote-tracking branch 'remotes/origin/develop' into 1427-oauth-admin-scopes

[akkoma] / config / config.exs

diff --git a/config/config.exs b/config/config.exs
index 9ac78c58961fdbf03782dc43ca20930625dc145c..a8534da5417ca042eefb815985bfa5cfd1c320c9 100644 (file)
--- a/config/config.exs
+++ b/config/config.exs
@@ -181,7 +181,7 @@ config :pleroma, Pleroma.Web.Endpoint,
 # Configures Elixir's Logger
 config :logger, :console,
   level: :debug,
-  format: "$time $metadata[$level] $message\n",
+  format: "\n$time $metadata[$level] $message\n",
   metadata: [:request_id]
 
 config :logger, :ex_syslogger,
@@ -209,6 +209,7 @@ config :tesla, adapter: Tesla.Adapter.Hackney
 config :pleroma, :http,
   proxy_url: nil,
   send_user_agent: true,
+  user_agent: :default,
   adapter: [
     ssl_options: [
       # Workaround for remote server certificate chain issues
@@ -561,7 +562,10 @@ config :ueberauth,
        base_path: "/oauth",
        providers: ueberauth_providers
 
-config :pleroma, :auth, oauth_consumer_strategies: oauth_consumer_strategies
+config :pleroma,
+       :auth,
+       enforce_oauth_admin_scope_usage: false,
+       oauth_consumer_strategies: oauth_consumer_strategies
 
 config :pleroma, Pleroma.Emails.Mailer, adapter: Swoosh.Adapters.Sendmail, enabled: false