Merge branch 'develop' into feature/digest-email

[akkoma] / config / prod.exs

diff --git a/config/prod.exs b/config/prod.exs
index cd5cdb087eb1b566b3947d972abc7a6fd37f1ca5..9c205cbd2f02cde66445e94235a807413dcf70e0 100644 (file)
--- a/config/prod.exs
+++ b/config/prod.exs
@@ -15,11 +15,12 @@ use Mix.Config
 # which you typically run after static files are built.
 config :pleroma, Pleroma.Web.Endpoint,
   http: [port: 4000],
-  protocol: "http",
-  serve_endpoints: true
+  protocol: "http"
+
+config :phoenix, serve_endpoints: true
 
 # Do not print debug messages in production
-config :logger, level: :info
+config :logger, level: :warn
 
 # ## SSL Support
 #
@@ -62,3 +63,6 @@ config :logger, level: :info
 # 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")