diff options
| author | minibikini <egor@kislitsyn.com> | 2020-10-27 18:59:19 +0000 |
|---|---|---|
| committer | minibikini <egor@kislitsyn.com> | 2020-10-27 18:59:19 +0000 |
| commit | 1bfd8528bbc71c8c34253eb245de7df498064fb4 (patch) | |
| tree | 97387260c85bb6b5505924de806110d8f71eb3fc /config/config.exs | |
| parent | 18a91d85e59eb67a2d58a28aae732c34b75ebe97 (diff) | |
| parent | 5aff4799515c141cb0a42686733b2f40faba6f86 (diff) | |
| download | pleroma-1bfd8528bbc71c8c34253eb245de7df498064fb4.tar.gz pleroma-1bfd8528bbc71c8c34253eb245de7df498064fb4.zip | |
Merge branch 'develop' into 'feature/local-only-scope'
# Conflicts:
# CHANGELOG.md
Diffstat (limited to 'config/config.exs')
| -rw-r--r-- | config/config.exs | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/config/config.exs b/config/config.exs index 2c6142360..bd611fd42 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" @@ -636,7 +635,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, |