From a506b7e1d7731e0e4011aa10278c6d0b7f8faeef Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Sat, 4 May 2019 15:28:27 +0300 Subject: [PATCH] undo priv_sid hacks --- lib/pleroma/plugs/instance_static.ex | 2 +- lib/pleroma/web/endpoint.ex | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/pleroma/plugs/instance_static.ex b/lib/pleroma/plugs/instance_static.ex index c63a9c95e..a64f1ea80 100644 --- a/lib/pleroma/plugs/instance_static.ex +++ b/lib/pleroma/plugs/instance_static.ex @@ -17,7 +17,7 @@ defmodule Pleroma.Plugs.InstanceStatic do if File.exists?(instance_path) do instance_path else - Path.join(Application.app_dir(:pleroma, "priv_sid/static/"), path) + Path.join(Application.app_dir(:pleroma, "priv/static/"), path) end end diff --git a/lib/pleroma/web/endpoint.ex b/lib/pleroma/web/endpoint.ex index 7d1453a49..7f939991d 100644 --- a/lib/pleroma/web/endpoint.ex +++ b/lib/pleroma/web/endpoint.ex @@ -23,7 +23,7 @@ defmodule Pleroma.Web.Endpoint do plug( Plug.Static, at: "/", - from: "priv_sid/static", + from: :pleroma, only: ~w(index.html robots.txt static finmoji emoji packs sounds images instance sw.js sw-pleroma.js favicon.png schemas doc) # credo:disable-for-previous-line Credo.Check.Readability.MaxLineLength