projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
[akkoma]
/
config
/
releases.exs
diff --git
a/config/releases.exs
b/config/releases.exs
index b224960dbff578a365455902e8a544d9edbb501e..19636765f51b6381ff6e18581c50fbd204624c29 100644
(file)
--- a/
config/releases.exs
+++ b/
config/releases.exs
@@
-6,6
+6,8
@@
config :pleroma, :modules, runtime_dir: "/var/lib/pleroma/modules"
config_path = System.get_env("PLEROMA_CONFIG_PATH") || "/etc/pleroma/config.exs"
config_path = System.get_env("PLEROMA_CONFIG_PATH") || "/etc/pleroma/config.exs"
+config :pleroma, release: true, config_path: config_path
+
if File.exists?(config_path) do
import_config config_path
else
if File.exists?(config_path) do
import_config config_path
else
@@
-18,3
+20,12
@@
else
IO.puts(warning)
end
IO.puts(warning)
end
+
+exported_config =
+ config_path
+ |> Path.dirname()
+ |> Path.join("prod.exported_from_db.secret.exs")
+
+if File.exists?(exported_config) do
+ import_config exported_config
+end