summaryrefslogtreecommitdiff
path: root/config/prod.exs
diff options
context:
space:
mode:
authorAlex Gleason <alex@alexgleason.me>2021-12-25 19:57:53 -0600
committerAlex Gleason <alex@alexgleason.me>2021-12-25 19:57:53 -0600
commitdb2bf55e9bb31af2ed34805ca7fa98ce67b471b1 (patch)
treef532711eaf19111e22375e87706edf5a3024e5b5 /config/prod.exs
parentb15c4629ff3093353ac5e37d381db1cdc4da1c3a (diff)
parent73609211a425922a5068d3912a36b82abe24e12c (diff)
downloadpleroma-db2bf55e9bb31af2ed34805ca7fa98ce67b471b1.tar.gz
pleroma-db2bf55e9bb31af2ed34805ca7fa98ce67b471b1.zip
Merge remote-tracking branch 'origin/develop' into notice-routes
Diffstat (limited to 'config/prod.exs')
-rw-r--r--config/prod.exs9
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")