aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorRoger Braun <roger@rogerbraun.net>2017-04-20 10:16:41 +0200
committerRoger Braun <roger@rogerbraun.net>2017-04-20 10:16:41 +0200
commit5e7ceeba94c179b5ffe98d1bb1115a2e0af196e2 (patch)
treeac709009ada18539ae9a48ab54712b6876640936 /lib
parentcc330421fd789f002d14e19692c4fbe75c0df4f2 (diff)
parent9167a2ebe30f3835f2e9139443dc60f8f0c44563 (diff)
downloadpleroma-5e7ceeba94c179b5ffe98d1bb1115a2e0af196e2.tar.gz
Merge branch 'ostatus' of ssh.gitgud.io:lambadalambda/pleroma into ostatus
Diffstat (limited to 'lib')
-rw-r--r--lib/pleroma/web/endpoint.ex3
-rw-r--r--lib/pleroma/web/router.ex10
2 files changed, 13 insertions, 0 deletions
diff --git a/lib/pleroma/web/endpoint.ex b/lib/pleroma/web/endpoint.ex
index 6af42a685..45a3a345d 100644
--- a/lib/pleroma/web/endpoint.ex
+++ b/lib/pleroma/web/endpoint.ex
@@ -9,6 +9,9 @@ defmodule Pleroma.Web.Endpoint do
# when deploying your static files in production.
plug Plug.Static,
at: "/media", from: "uploads", gzip: false
+ plug Plug.Static,
+ at: "/", from: :pleroma,
+ only: ~w(index.html static)
# Code reloading can be explicitly enabled under the
# :code_reloader configuration of your endpoint.
diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex
index e6d000881..0264d8d3f 100644
--- a/lib/pleroma/web/router.ex
+++ b/lib/pleroma/web/router.ex
@@ -71,4 +71,14 @@ defmodule Pleroma.Web.Router do
get "/host-meta", WebFinger.WebFingerController, :host_meta
get "/webfinger", WebFinger.WebFingerController, :webfinger
end
+
+ scope "/", Fallback do
+ get "/*path", RedirectController, :redirector
+ end
+
+end
+
+defmodule Fallback.RedirectController do
+ use Pleroma.Web, :controller
+ def redirector(conn, _params), do: send_file(conn, 200, "priv/static/index.html")
end