Merge branch '1668-prometheus-access-restrictions' into 'develop'
authorfeld <feld@feld.me>
Tue, 27 Oct 2020 17:47:56 +0000 (17:47 +0000)
committerfeld <feld@feld.me>
Tue, 27 Oct 2020 17:47:56 +0000 (17:47 +0000)
[#1668] App metrics endpoint (Prometheus) access restrictions

Closes #1668

See merge request pleroma/pleroma!3093

1  2 
CHANGELOG.md
config/config.exs
config/description.exs
lib/pleroma/web/endpoint.ex

diff --cc CHANGELOG.md
Simple merge
Simple merge
Simple merge
index d0e01f3d94b8bd038cbcfe5f1537d566669eb486,1a8fdd8b9d1a7b740e3a428988d662c625aa9e9f..f26542e888c435917c48b08d62664fc569d4aa5d
@@@ -7,10 -7,10 +7,12 @@@ defmodule Pleroma.Web.Endpoint d
  
    require Pleroma.Constants
  
+   alias Pleroma.Config
    socket("/socket", Pleroma.Web.UserSocket)
  
 +  plug(Plug.Telemetry, event_prefix: [:phoenix, :endpoint])
 +
    plug(Pleroma.Web.Plugs.SetLocalePlug)
    plug(CORSPlug)
    plug(Pleroma.Web.Plugs.HTTPSecurityPlug)