X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=config%2Fprod.exs;h=9c205cbd2f02cde66445e94235a807413dcf70e0;hb=089d53a961f14681cf91c923eeb67478ec230da9;hp=e281a4a03a6a8be35f234d058fbfd5bb2c64fd36;hpb=10c156d98fee44444ed6d1366e615ddcdb2ee68a;p=akkoma

diff --git a/config/prod.exs b/config/prod.exs
index e281a4a03..9c205cbd2 100644
--- a/config/prod.exs
+++ b/config/prod.exs
@@ -17,49 +17,10 @@ config :pleroma, Pleroma.Web.Endpoint,
   http: [port: 4000],
   protocol: "http"
 
-# Supported adapters: https://github.com/swoosh/swoosh#adapters
-mailer_settings =
-  case String.downcase(System.get_env("PLEROMA_SWOOSH_ADAPTER") || "") do
-    "mailgun" ->
-      [
-        adapter: Swoosh.Adapters.Mailgun,
-        api_key: System.get_env("PLEROMA_MAILGUN_API_KEY"),
-        domain: System.get_env("PLEROMA_MAILGUN_DOMAIN")
-      ]
-
-    "mandrill" ->
-      [
-        adapter: Swoosh.Adapters.Mandrill,
-        api_key: System.get_env("PLEROMA_MANDRILL_API_KEY")
-      ]
-
-    "sendgrid" ->
-      [
-        adapter: Swoosh.Adapters.Sendgrid,
-        api_key: System.get_env("PLEROMA_SENDGRID_API_KEY")
-      ]
-
-    "smtp" ->
-      [
-        adapter: Swoosh.Adapters.SMTP,
-        relay: System.get_env("PLEROMA_SMTP_RELAY"),
-        username: System.get_env("PLEROMA_SMTP_USERNAME"),
-        password: System.get_env("PLEROMA_SMTP_PASSWORD"),
-        port: System.get_env("PLEROMA_SMTP_PORT") || 1025,
-        ssl: true,
-        tls: :always,
-        auth: :always,
-        retries: 3
-      ]
-
-    _ ->
-      [adapter: Swoosh.Adapters.Local]
-  end
-
-config :pleroma, Pleroma.Mailer, mailer_settings
+config :phoenix, serve_endpoints: true
 
 # Do not print debug messages in production
-config :logger, level: :info
+config :logger, level: :warn
 
 # ## SSL Support
 #
@@ -102,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")