diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-10-28 19:03:40 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-10-28 19:03:40 +0300 |
| commit | ba50dc05a8d655deece0aa619aebe1e25dc9d4eb (patch) | |
| tree | 4fd9c8ccc64de7b7ab1be6dd0659d34a6daa87d9 /config/config.exs | |
| parent | d54233760f4c006d89aa80e0ae78cb6910fc74ab (diff) | |
| parent | 342c2e1bc0055b71a9772ef031eab3e8bc88d29b (diff) | |
| download | pleroma-ba50dc05a8d655deece0aa619aebe1e25dc9d4eb.tar.gz pleroma-ba50dc05a8d655deece0aa619aebe1e25dc9d4eb.zip | |
Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller-no-auth-check-on-non-federating-instances
# Conflicts:
# CHANGELOG.md
Diffstat (limited to 'config/config.exs')
| -rw-r--r-- | config/config.exs | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/config/config.exs b/config/config.exs index 2c6142360..c52ee8f82 100644 --- a/config/config.exs +++ b/config/config.exs @@ -123,7 +123,6 @@ websocket_config = [ # Configures the endpoint config :pleroma, Pleroma.Web.Endpoint, - instrumenters: [Pleroma.Web.Endpoint.Instrumenter], url: [host: "localhost"], http: [ ip: {127, 0, 0, 1}, @@ -143,7 +142,7 @@ config :pleroma, Pleroma.Web.Endpoint, secret_key_base: "aK4Abxf29xU9TTDKre9coZPUgevcVCFQJe/5xP/7Lt4BEif6idBIbjupVbOrbKxl", signing_salt: "CqaoopA2", render_errors: [view: Pleroma.Web.ErrorView, accepts: ~w(json)], - pubsub: [name: Pleroma.PubSub, adapter: Phoenix.PubSub.PG2], + pubsub_server: Pleroma.PubSub, secure_cookie_flag: true, extra_cookie_attrs: [ "SameSite=Lax" @@ -235,6 +234,7 @@ config :pleroma, :instance, "text/bbcode" ], autofollowed_nicknames: [], + autofollowing_nicknames: [], max_pinned_statuses: 1, attachment_links: false, max_report_comment_size: 1000, @@ -636,7 +636,12 @@ config :pleroma, Pleroma.Emails.UserEmail, config :pleroma, Pleroma.Emails.NewUsersDigestEmail, enabled: false -config :prometheus, Pleroma.Web.Endpoint.MetricsExporter, path: "/api/pleroma/app_metrics" +config :prometheus, Pleroma.Web.Endpoint.MetricsExporter, + enabled: false, + auth: false, + ip_whitelist: [], + path: "/api/pleroma/app_metrics", + format: :text config :pleroma, Pleroma.ScheduledActivity, daily_user_limit: 25, |