aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hagelberg <phil@hagelb.org>2019-11-07 19:31:28 -0800
committerPhil Hagelberg <phil@hagelb.org>2019-11-09 18:08:45 -0800
commit886a07ba573a7dc566f51cfb44e69dac49f401cd (patch)
tree882ccb55d25ad8f0737acda6cf8913f23915a6ff
parentb0080fa73010cda34215baeee230481b5c56dbca (diff)
downloadpleroma-886a07ba573a7dc566f51cfb44e69dac49f401cd.tar.gz
Move static_fe config to its own section instead of in :instance.
-rw-r--r--config/config.exs2
-rw-r--r--lib/pleroma/plugs/static_fe_plug.ex2
2 files changed, 3 insertions, 1 deletions
diff --git a/config/config.exs b/config/config.exs
index 787809b27..685c18380 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -599,6 +599,8 @@ config :pleroma, Pleroma.ActivityExpiration, enabled: true
config :pleroma, Pleroma.Plugs.RemoteIp, enabled: false
+config :pleroma, :static_fe, enabled: false
+
config :pleroma, :web_cache_ttl,
activity_pub: nil,
activity_pub_question: 30_000
diff --git a/lib/pleroma/plugs/static_fe_plug.ex b/lib/pleroma/plugs/static_fe_plug.ex
index 2af45e52a..b3fb3c582 100644
--- a/lib/pleroma/plugs/static_fe_plug.ex
+++ b/lib/pleroma/plugs/static_fe_plug.ex
@@ -18,7 +18,7 @@ defmodule Pleroma.Plugs.StaticFEPlug do
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
conn |> get_req_header("accept") |> List.first() |> String.contains?("text/html")