diff options
| author | Mark Felder <feld@FreeBSD.org> | 2020-01-22 15:05:39 -0600 |
|---|---|---|
| committer | Mark Felder <feld@FreeBSD.org> | 2020-01-22 15:05:39 -0600 |
| commit | ae78059ff433739b83aaa3ccff9245ace153146d (patch) | |
| tree | f25e9b709b567b33377c5b9bb0c29a91dbb1c9b9 /config/releases.exs | |
| parent | 7bfb8ed14d2d222e6fcd7afe54f229f68370f061 (diff) | |
| parent | be2777715650d0ac80509f0bd22b4cea8641f9b3 (diff) | |
| download | pleroma-ae78059ff433739b83aaa3ccff9245ace153146d.tar.gz pleroma-ae78059ff433739b83aaa3ccff9245ace153146d.zip | |
Merge branch 'develop' into features/remote-follow-userpage-redirect
Diffstat (limited to 'config/releases.exs')
| -rw-r--r-- | config/releases.exs | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/config/releases.exs b/config/releases.exs index b224960db..19636765f 100644 --- 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 :pleroma, release: true, config_path: config_path + if File.exists?(config_path) do import_config config_path else @@ -18,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 |