diff options
| author | rinpatch <rinpatch@sdf.org> | 2020-11-25 11:57:13 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2020-11-25 11:57:13 +0000 |
| commit | 7a8be68241c9872a4271b53c30ebdc34f9ecf41d (patch) | |
| tree | c3dbcd2d61b9f606212aba1e335406d08330a55f /config | |
| parent | c2bf67644e82c54de6da9b030640255119e8c229 (diff) | |
| parent | 5eef4988bf968e12329e6e4ee89beccee19a66ce (diff) | |
| download | pleroma-7a8be68241c9872a4271b53c30ebdc34f9ecf41d.tar.gz pleroma-7a8be68241c9872a4271b53c30ebdc34f9ecf41d.zip | |
Merge branch 'fix/2323-release-configuration-provider' into 'develop'
Fix for elixir 1.11
Closes #2323
See merge request pleroma/pleroma!3173
Diffstat (limited to 'config')
| -rw-r--r-- | config/releases.exs | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/config/releases.exs b/config/releases.exs deleted file mode 100644 index 19636765f..000000000 --- a/config/releases.exs +++ /dev/null @@ -1,31 +0,0 @@ -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 - warning = [ - IO.ANSI.red(), - IO.ANSI.bright(), - "!!! #{config_path} not found! Please ensure it exists and that PLEROMA_CONFIG_PATH is unset or points to an existing file", - IO.ANSI.reset() - ] - - 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 |