diff options
| author | Alex Gleason <alex@alexgleason.me> | 2021-05-29 12:29:58 -0500 |
|---|---|---|
| committer | Alex Gleason <alex@alexgleason.me> | 2021-05-29 12:29:58 -0500 |
| commit | 1a69f59221b7009ab76df9abf24403d2711dbaf3 (patch) | |
| tree | 81c71c2290a5d0c3ffe4857ec480ebf14788668e /config/prod.exs | |
| parent | 3ff9c5e2a67ab83c2abdb14cd246dea059079e75 (diff) | |
| parent | 8871ca5aa35e9533e57b4a15420687869378a981 (diff) | |
| download | pleroma-1a69f59221b7009ab76df9abf24403d2711dbaf3.tar.gz pleroma-1a69f59221b7009ab76df9abf24403d2711dbaf3.zip | |
Merge remote-tracking branch 'pleroma/develop' into cycles-html
Diffstat (limited to 'config/prod.exs')
| -rw-r--r-- | config/prod.exs | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/config/prod.exs b/config/prod.exs index adbce5606..968f596e0 100644 --- a/config/prod.exs +++ b/config/prod.exs @@ -1,4 +1,4 @@ -use Mix.Config +import Config # For production, we often load configuration from external # sources, such as your system environment. For this reason, @@ -63,7 +63,12 @@ config :logger, :ex_syslogger, level: :info # Finally import the config/prod.secret.exs # which should be versioned separately. -import_config "prod.secret.exs" +if File.exists?("./config/prod.secret.exs") do + import_config "prod.secret.exs" +else + "`config/prod.secret.exs` not found. You may want to create one by running `mix pleroma.instance gen`" + |> IO.warn([]) +end if File.exists?("./config/prod.exported_from_db.secret.exs"), do: import_config("prod.exported_from_db.secret.exs") |