diff options
| author | Maksim Pechnikov <parallel588@gmail.com> | 2019-11-28 21:26:56 +0300 |
|---|---|---|
| committer | Maksim Pechnikov <parallel588@gmail.com> | 2019-11-28 21:27:01 +0300 |
| commit | b7c449118bc09ab36610e85292d153ace67c2b89 (patch) | |
| tree | 1b00c2dec9d233ec3aaefd699aee3f4080f68119 /config | |
| parent | 1403a1441de36e8a58da5e996c208a9c10f65440 (diff) | |
| parent | ca1acfa314a57f78c2f5f8e60a4bd1380350e483 (diff) | |
| download | pleroma-b7c449118bc09ab36610e85292d153ace67c2b89.tar.gz pleroma-b7c449118bc09ab36610e85292d153ace67c2b89.zip | |
Merge branch 'develop' into issue/1383
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 1 | ||||
| -rw-r--r-- | config/prod.exs | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/config/config.exs b/config/config.exs index 54d167a82..e7e17669e 100644 --- a/config/config.exs +++ b/config/config.exs @@ -195,6 +195,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 301d2b9cb..25873f360 100644 --- a/config/prod.exs +++ b/config/prod.exs @@ -21,6 +21,7 @@ config :phoenix, serve_endpoints: true # Do not print debug messages in production config :logger, :console, level: :warn +config :logger, :ex_syslogger, level: :warn # ## SSL Support # |