diff options
| author | Egor Kislitsyn <egor@kislitsyn.com> | 2019-04-08 16:29:20 +0700 |
|---|---|---|
| committer | Egor Kislitsyn <egor@kislitsyn.com> | 2019-04-08 16:29:20 +0700 |
| commit | a1a854646e96598473ed7a323e034cf1f88ca508 (patch) | |
| tree | 4a427437c7c444fdfd2bb99dc012a7008d9bb0fe /config | |
| parent | 1c2e4f88d1a707791818014f8bcdedd986c2fa75 (diff) | |
| parent | fb2040d06199f2f4190ff363da54d6fcfa87ff69 (diff) | |
| download | pleroma-a1a854646e96598473ed7a323e034cf1f88ca508.tar.gz pleroma-a1a854646e96598473ed7a323e034cf1f88ca508.zip | |
Merge branch 'develop' into use-jobs-in-webpush
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/config/config.exs b/config/config.exs index d97586a61..0a80287ae 100644 --- a/config/config.exs +++ b/config/config.exs @@ -8,6 +8,10 @@ use Mix.Config # General application configuration config :pleroma, ecto_repos: [Pleroma.Repo] +config :pleroma, Pleroma.Repo, + types: Pleroma.PostgresTypes, + telemetry_event: [Pleroma.Repo.Instrumenter] + config :pleroma, Pleroma.Captcha, enabled: false, seconds_valid: 60, @@ -87,6 +91,7 @@ websocket_config = [ # Configures the endpoint config :pleroma, Pleroma.Web.Endpoint, + instrumenters: [Pleroma.Web.Endpoint.Instrumenter], url: [host: "localhost"], http: [ dispatch: [ @@ -386,6 +391,8 @@ config :pleroma, :ldap, config :pleroma, Pleroma.Mailer, adapter: Swoosh.Adapters.Sendmail +config :prometheus, Pleroma.Web.Endpoint.MetricsExporter, path: "/api/pleroma/app_metrics" + # 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" |