diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2019-12-06 00:26:31 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2019-12-06 00:26:31 +0300 |
| commit | 13926537b644c3a4f1904c2fcd5d25fe0f284663 (patch) | |
| tree | 713182a80672ab37ad9284ad82b399107f050208 /config | |
| parent | af42c00cfffb2cd8e93857cd1cf2901113c45bd2 (diff) | |
| parent | 228bf4d214abe3bb62c52128d3bc145e396b174d (diff) | |
| download | pleroma-13926537b644c3a4f1904c2fcd5d25fe0f284663.tar.gz pleroma-13926537b644c3a4f1904c2fcd5d25fe0f284663.zip | |
Merge remote-tracking branch 'remotes/origin/develop' into 1427-oauth-admin-scopes
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 4 | ||||
| -rw-r--r-- | config/prod.exs | 3 | ||||
| -rw-r--r-- | config/releases.exs | 2 | ||||
| -rw-r--r-- | config/test.exs | 4 |
4 files changed, 9 insertions, 4 deletions
diff --git a/config/config.exs b/config/config.exs index 64397484e..a8534da54 100644 --- a/config/config.exs +++ b/config/config.exs @@ -180,7 +180,8 @@ config :pleroma, Pleroma.Web.Endpoint, # Configures Elixir's Logger config :logger, :console, - format: "$time $metadata[$level] $message\n", + level: :debug, + format: "\n$time $metadata[$level] $message\n", metadata: [:request_id] config :logger, :ex_syslogger, @@ -208,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 diff --git a/config/prod.exs b/config/prod.exs index 9c205cbd2..25873f360 100644 --- a/config/prod.exs +++ b/config/prod.exs @@ -20,7 +20,8 @@ config :pleroma, Pleroma.Web.Endpoint, config :phoenix, serve_endpoints: true # Do not print debug messages in production -config :logger, level: :warn +config :logger, :console, level: :warn +config :logger, :ex_syslogger, level: :warn # ## SSL Support # diff --git a/config/releases.exs b/config/releases.exs index 36c493673..98c5ceccd 100644 --- a/config/releases.exs +++ b/config/releases.exs @@ -1,6 +1,6 @@ import Config -config :pleroma, :instance, static: "/var/lib/pleroma/static" +config :pleroma, :instance, static_dir: "/var/lib/pleroma/static" config :pleroma, Pleroma.Uploaders.Local, uploads: "/var/lib/pleroma/uploads" config_path = System.get_env("PLEROMA_CONFIG_PATH") || "/etc/pleroma/config.exs" diff --git a/config/test.exs b/config/test.exs index da2778aa7..9b737d4d7 100644 --- a/config/test.exs +++ b/config/test.exs @@ -15,7 +15,9 @@ config :pleroma, Pleroma.Captcha, method: Pleroma.Captcha.Mock # Print only warnings and errors during test -config :logger, level: :warn +config :logger, :console, + level: :warn, + format: "\n[$level] $message\n" config :pleroma, :auth, oauth_consumer_strategies: [] |