projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'stable' into release/2.0.0
[akkoma]
/
lib
/
pleroma
/
config
/
loader.ex
diff --git
a/lib/pleroma/config/loader.ex
b/lib/pleroma/config/loader.ex
index 68b247381d9680c00e876c83d07bc63a66263923..df2d18725bc59cd9dd94aeb7e230052cefab66c9 100644
(file)
--- a/
lib/pleroma/config/loader.ex
+++ b/
lib/pleroma/config/loader.ex
@@
-1,10
+1,8
@@
# Pleroma: A lightweight social networking server
# Pleroma: A lightweight social networking server
-# Copyright © 2017-20
19
Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-20
20
Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Config.Loader do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Config.Loader do
- @paths ["config/config.exs", "config/#{Mix.env()}.exs"]
-
@reject_keys [
Pleroma.Repo,
Pleroma.Web.Endpoint,
@reject_keys [
Pleroma.Repo,
Pleroma.Web.Endpoint,
@@
-35,8
+33,8
@@
defmodule Pleroma.Config.Loader do
def load_and_merge do
all_paths =
if Pleroma.Config.get(:release),
def load_and_merge do
all_paths =
if Pleroma.Config.get(:release),
- do:
@paths ++ [
"config/releases.exs"],
- else:
@paths
+ do:
["config/config.exs",
"config/releases.exs"],
+ else:
["config/config.exs"]
all_paths
|> Enum.map(&load(&1))
all_paths
|> Enum.map(&load(&1))