diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-11-25 21:48:18 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-11-25 21:48:18 +0300 |
| commit | 62993db499ca565cdb0a404f9668528971adf9dd (patch) | |
| tree | 82aed196eee45e09e36b500b948235674d817530 /config | |
| parent | 12a5981cc3da65b7f2763d0ec05871b0986234f5 (diff) | |
| parent | 7a8be68241c9872a4271b53c30ebdc34f9ecf41d (diff) | |
| download | pleroma-62993db499ca565cdb0a404f9668528971adf9dd.tar.gz pleroma-62993db499ca565cdb0a404f9668528971adf9dd.zip | |
Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements
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 |