X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=config%2Fprod.exs;h=968f596e00bc804bb71e06e112b2487f8939700f;hb=edf7d5089f3d6a114f0c253427ac4d777b6b0a1a;hp=cd5cdb087eb1b566b3947d972abc7a6fd37f1ca5;hpb=4b98a7ce4ef4b4e7b74f533e6d6ed343e1b34c48;p=akkoma

diff --git a/config/prod.exs b/config/prod.exs
index cd5cdb087..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,
@@ -15,11 +15,13 @@ 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, :console, level: :info
+config :logger, :ex_syslogger, level: :info
 
 # ## SSL Support
 #
@@ -61,4 +63,12 @@ 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.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")