X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=config%2Fdev.exs;h=7e1e3b4beb2a5add28c054f79f71c3ee328708ae;hb=e02eb8de3ec8130e9808c6a54a5c78f7ec8feb23;hp=8f89aa03c3d4a68e0097a652fc9e24f6d1c5c2af;hpb=89fbed88212657e3dcd4bbcb2c0718b07802037f;p=akkoma

diff --git a/config/dev.exs b/config/dev.exs
index 8f89aa03c..7e1e3b4be 100644
--- a/config/dev.exs
+++ b/config/dev.exs
@@ -12,13 +12,13 @@ config :pleroma, Pleroma.Web.Endpoint,
     protocol_options: [max_request_line_length: 8192, max_header_value_length: 8192]
   ],
   protocol: "http",
-  secure_cookie_flag: false,
   debug_errors: true,
   code_reloader: true,
   check_origin: false,
-  watchers: []
+  watchers: [],
+  secure_cookie_flag: false
 
-config :pleroma, Pleroma.Mailer, adapter: Swoosh.Adapters.Local
+config :pleroma, Pleroma.Emails.Mailer, adapter: Swoosh.Adapters.Local
 
 # ## SSL Support
 #
@@ -59,3 +59,6 @@ else
     "!!! RUNNING IN LOCALHOST DEV MODE! !!!\nFEDERATION WON'T WORK UNTIL YOU CONFIGURE A dev.secret.exs"
   )
 end
+
+if File.exists?("./config/dev.exported_from_db.secret.exs"),
+  do: import_config("dev.exported_from_db.secret.exs")