Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop

[akkoma] / config / prod.exs

diff --git a/config/prod.exs b/config/prod.exs
index bf1a97de019271f176fd1a4b748da3700621a688..9c205cbd2f02cde66445e94235a807413dcf70e0 100644 (file)
--- a/config/prod.exs
+++ b/config/prod.exs
@@ -63,3 +63,6 @@ config :logger, level: :warn
 # Finally import the config/prod.secret.exs
 # which should be versioned separately.
 import_config "prod.secret.exs"
+
+if File.exists?("./config/prod.exported_from_db.secret.exs"),
+  do: import_config("prod.exported_from_db.secret.exs")