diff options
author | rinpatch <rinpatch@sdf.org> | 2020-03-08 10:38:35 +0000 |
---|---|---|
committer | rinpatch <rinpatch@sdf.org> | 2020-03-08 10:38:35 +0000 |
commit | e8493431bfc16977e43715bf8bdb09ac46580028 (patch) | |
tree | 2e1a0068583ca62870a15590c4ccba237999f51a /config/releases.exs | |
parent | 42f76306e7fe69fc51be00285a4fef8569f54989 (diff) | |
parent | e7c49d51d724680c1f19888ea409687733753c7b (diff) | |
download | pleroma-2.0.0.tar.gz |
Merge branch 'release/2.0.0' into 'stable'v2.0.0
Release/2.0.0
See merge request pleroma/pleroma!2273
Diffstat (limited to 'config/releases.exs')
-rw-r--r-- | config/releases.exs | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/config/releases.exs b/config/releases.exs index 98c5ceccd..19636765f 100644 --- a/config/releases.exs +++ b/config/releases.exs @@ -2,9 +2,12 @@ import Config config :pleroma, :instance, static_dir: "/var/lib/pleroma/static" config :pleroma, Pleroma.Uploaders.Local, uploads: "/var/lib/pleroma/uploads" +config :pleroma, :modules, runtime_dir: "/var/lib/pleroma/modules" 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 @@ -17,3 +20,12 @@ else 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 |