diff options
author | Alex Gleason <alex@alexgleason.me> | 2021-05-28 13:38:44 -0500 |
---|---|---|
committer | Alex Gleason <alex@alexgleason.me> | 2021-05-28 13:38:44 -0500 |
commit | 05b47aacd25a86ba6dfcdd6577c6c558229c8e95 (patch) | |
tree | e4ecd6498fc64a78bf8d92c2ca6e8f8edc0fbcfe /config/prod.exs | |
parent | 9b0b0842ce2b0b9a870f57e16025160855aa4c11 (diff) | |
parent | 7ad87571bdcd39959280d15f5bfe4175e04c442c (diff) | |
download | pleroma-endpoint-url.tar.gz |
Merge remote-tracking branch 'pleroma/develop' into endpoint-urlendpoint-url
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") |