diff options
| author | kaniini <nenolod@gmail.com> | 2018-08-26 21:06:15 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2018-08-26 21:06:15 +0000 |
| commit | 0f5bff8c66fa2b67633fe05de8aaa1985f4d98f8 (patch) | |
| tree | 45a693814a7f1f7bd2d6108732f2b75086f1fa0a /config/config.exs | |
| parent | 30261772063a30ca0ef299f441cfed4630ffb630 (diff) | |
| parent | 3448b434f54e8b4749524e3ccd876359a6501845 (diff) | |
| download | pleroma-0f5bff8c66fa2b67633fe05de8aaa1985f4d98f8.tar.gz pleroma-0f5bff8c66fa2b67633fe05de8aaa1985f4d98f8.zip | |
Merge branch 'develop' into 'feature/relay'
# Conflicts:
# lib/pleroma/web/activity_pub/utils.ex
Diffstat (limited to 'config/config.exs')
| -rw-r--r-- | config/config.exs | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/config/config.exs b/config/config.exs index f3102aea3..eaf20e8f9 100644 --- a/config/config.exs +++ b/config/config.exs @@ -16,6 +16,8 @@ config :pleroma, Pleroma.Upload, config :pleroma, :emoji, shortcode_globs: ["/emoji/custom/**/*.png"] +config :pleroma, :uri_schemes, additionnal_schemes: [] + # Configures the endpoint config :pleroma, Pleroma.Web.Endpoint, url: [host: "localhost"], @@ -71,11 +73,8 @@ config :pleroma, :fe, redirect_root_no_login: "/main/all", redirect_root_login: "/main/friends", show_instance_panel: true, - show_who_to_follow_panel: false, - who_to_follow_provider: - "https://vinayaka.distsn.org/cgi-bin/vinayaka-user-match-osa-api.cgi?{{host}}+{{user}}", - who_to_follow_link: "https://vinayaka.distsn.org/?{{host}}+{{user}}", - scope_options_enabled: false + scope_options_enabled: false, + collapse_message_with_subject: false config :pleroma, :activitypub, accept_blocks: true, @@ -112,6 +111,13 @@ config :pleroma, :gopher, ip: {0, 0, 0, 0}, port: 9999 +config :pleroma, :suggestions, + enabled: false, + third_party_engine: + "http://vinayaka.distsn.org/cgi-bin/vinayaka-user-match-suggestions-api.cgi?{{host}}+{{user}}", + timeout: 300_000, + web: "https://vinayaka.distsn.org/?{{host}}+{{user}}" + # 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" |