diff options
| author | Roman Chvanikov <chvanikoff@pm.me> | 2020-07-21 19:59:34 +0300 |
|---|---|---|
| committer | Roman Chvanikov <chvanikoff@pm.me> | 2020-07-21 19:59:34 +0300 |
| commit | dba47567490b2a7205f37edb07cbbe8ebd248812 (patch) | |
| tree | e393bbd54c04548e7bfb7bc007bc79c05324522d | |
| parent | 43d9877ba904d3165a9cbee134d2f000c044c1d1 (diff) | |
| download | pleroma-dba47567490b2a7205f37edb07cbbe8ebd248812.tar.gz | |
Update configs
| -rw-r--r-- | config/config.exs | 6 | ||||
| -rw-r--r-- | config/dev.exs | 6 | ||||
| -rw-r--r-- | lib/mix/tasks/pleroma/frontend.ex | 1 |
3 files changed, 7 insertions, 6 deletions
diff --git a/config/config.exs b/config/config.exs index 2d3f35e70..b53660ce4 100644 --- a/config/config.exs +++ b/config/config.exs @@ -706,6 +706,12 @@ config :ex_aws, http_client: Pleroma.HTTP.ExAws config :pleroma, :instances_favicons, enabled: false +config :pleroma, :frontends, + primary: %{"name" => "none", "ref" => "none"}, + mastodon: %{"name" => "mastodon", "ref" => "none"}, + admin: %{"name" => "admin", "ref" => "none"}, + static: true + # Import environment specific config. This must remain at the bottom # of this file so it overrides the configuration defined above. import_config "#{Mix.env()}.exs" diff --git a/config/dev.exs b/config/dev.exs index 128e91dca..4faaeff5b 100644 --- a/config/dev.exs +++ b/config/dev.exs @@ -54,12 +54,6 @@ config :pleroma, Pleroma.Repo, config :pleroma, Pleroma.Web.ApiSpec.CastAndValidate, strict: true -config :pleroma, :frontends, - primary: %{"name" => "pleroma", "ref" => "5d49edc8"}, - mastodon: %{"name" => "mastodon", "ref" => "b1e42686"}, - admin: %{"name" => "admin", "ref" => "d7eaf61a"}, - static: true - if File.exists?("./config/dev.secret.exs") do import_config "dev.secret.exs" else diff --git a/lib/mix/tasks/pleroma/frontend.ex b/lib/mix/tasks/pleroma/frontend.ex index 493dd9064..14d47aaba 100644 --- a/lib/mix/tasks/pleroma/frontend.ex +++ b/lib/mix/tasks/pleroma/frontend.ex @@ -27,6 +27,7 @@ defmodule Mix.Tasks.Pleroma.Frontend do def run(["install", "none" | _args]) do shell_info("Skipping frontend installation because none was requested") + "none" end def run(["install", unknown_fe | _args]) when unknown_fe not in @known_frontends do |