moon
/
spc-pleroma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move static_fe config to its own section instead of in :instance.

This commit is contained in:
Phil Hagelberg 2019-11-07 19:31:28 -08:00
parent b0080fa730
commit 886a07ba57
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/config.exs
View File

@ -599,6 +599,8 @@
config :pleroma, Pleroma.Plugs.RemoteIp, enabled: false config :pleroma, Pleroma.Plugs.RemoteIp, enabled: false
config :pleroma, :static_fe, enabled: false
config :pleroma, :web_cache_ttl, config :pleroma, :web_cache_ttl,
activity_pub: nil, activity_pub: nil,
activity_pub_question: 30_000 activity_pub_question: 30_000

2
lib/pleroma/plugs/static_fe_plug.ex
View File

@ -18,7 +18,7 @@ def call(conn, _) do
end end
end end
defp enabled?, do: Pleroma.Config.get([:instance, :static_fe], false) defp enabled?, do: Pleroma.Config.get([:static_fe, :enabled], false)
defp accepts_html?(conn) do defp accepts_html?(conn) do
conn |> get_req_header("accept") |> List.first() |> String.contains?("text/html") conn |> get_req_header("accept") |> List.first() |> String.contains?("text/html")