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 1179cf3b0a383f36f2084d8ceedc05e69c4f65fd..9c205cbd2f02cde66445e94235a807413dcf70e0 100644 (file)
--- a/config/prod.exs
+++ b/config/prod.exs
@@ -17,6 +17,8 @@ config :pleroma, Pleroma.Web.Endpoint,
   http: [port: 4000],
   protocol: "http"
 
+config :phoenix, serve_endpoints: true
+
 # Do not print debug messages in production
 config :logger, level: :warn
 
@@ -61,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")