diff options
| author | link0ff <juri@linkov.net> | 2019-03-14 17:43:30 +0200 |
|---|---|---|
| committer | link0ff <juri@linkov.net> | 2019-03-14 17:43:30 +0200 |
| commit | 54e7087ab412a488f8ad7286aef89d313e5e7b14 (patch) | |
| tree | 9391107eb5aec3940bf6150539acc38e85224751 /config | |
| parent | 9338f061a303ae3d57a8ea1af524c2ca51929f8d (diff) | |
| parent | 59333f2d568dc6e50fb72e5114ec7dd6bcc1ebef (diff) | |
| download | pleroma-54e7087ab412a488f8ad7286aef89d313e5e7b14.tar.gz pleroma-54e7087ab412a488f8ad7286aef89d313e5e7b14.zip | |
Merge remote-tracking branch 'upstream/develop' into feature/openldap-support
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 16 | ||||
| -rw-r--r-- | config/test.exs | 2 |
2 files changed, 17 insertions, 1 deletions
diff --git a/config/config.exs b/config/config.exs index 1ed330df2..a1e6c8def 100644 --- a/config/config.exs +++ b/config/config.exs @@ -133,7 +133,14 @@ config :pleroma, :httpoison, Pleroma.HTTP config :tesla, adapter: Tesla.Adapter.Hackney # Configures http settings, upstream proxy etc. -config :pleroma, :http, proxy_url: nil +config :pleroma, :http, + proxy_url: nil, + adapter: [ + ssl_options: [ + # We don't support TLS v1.3 yet + versions: [:tlsv1, :"tlsv1.1", :"tlsv1.2"] + ] + ] config :pleroma, :instance, name: "Pleroma", @@ -215,6 +222,9 @@ config :pleroma, :frontend_configurations, scopeCopy: true, subjectLineBehavior: "email", alwaysShowSubjectInput: true + }, + masto_fe: %{ + showInstanceSpecificPanel: true } config :pleroma, :activitypub, @@ -345,6 +355,10 @@ config :pleroma, Pleroma.Jobs, federator_outgoing: [max_jobs: 50], mailer: [max_jobs: 10] +config :pleroma, :fetch_initial_posts, + enabled: false, + pages: 5 + config :auto_linker, opts: [ scheme: true, diff --git a/config/test.exs b/config/test.exs index fbeba0919..6dfa698c8 100644 --- a/config/test.exs +++ b/config/test.exs @@ -44,6 +44,8 @@ config :web_push_encryption, :vapid_details, "BLH1qVhJItRGCfxgTtONfsOKDc9VRAraXw-3NsmjMngWSh7NxOizN6bkuRA7iLTMPS82PjwJAr3UoK9EC1IFrz4", private_key: "_-XZ0iebPrRfZ_o0-IatTdszYa8VCH1yLN-JauK7HHA" +config :web_push_encryption, :http_client, Pleroma.Web.WebPushHttpClientMock + config :pleroma, Pleroma.Jobs, testing: [max_jobs: 2] try do |