From: feld <feld@feld.me>
Date: Tue, 27 Oct 2020 17:47:56 +0000 (+0000)
Subject: Merge branch '1668-prometheus-access-restrictions' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=5aff4799515c141cb0a42686733b2f40faba6f86;p=akkoma

Merge branch '1668-prometheus-access-restrictions' into 'develop'

[#1668] App metrics endpoint (Prometheus) access restrictions

Closes #1668

See merge request pleroma/pleroma!3093
---

5aff4799515c141cb0a42686733b2f40faba6f86
diff --cc lib/pleroma/web/endpoint.ex
index d0e01f3d9,1a8fdd8b9..f26542e88
--- a/lib/pleroma/web/endpoint.ex
+++ b/lib/pleroma/web/endpoint.ex
@@@ -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)