X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=config%2Fdev.exs;h=71b11f7c3ebb0b3dc604cdf602fc6dc903cedf47;hb=df2dab69a7756153ef015bb705b256b35f07fc0c;hp=f77bb99765f4014bb51db91b3fc8fb318ed8f3bd;hpb=adcdd21f16c3364b293fefdd7008a531c0627317;p=akkoma

diff --git a/config/dev.exs b/config/dev.exs
index f77bb9976..71b11f7c3 100644
--- a/config/dev.exs
+++ b/config/dev.exs
@@ -12,14 +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: [],
   secure_cookie_flag: false
 
-config :pleroma, Pleroma.Mailer, adapter: Swoosh.Adapters.Local
+config :pleroma, Pleroma.Emails.Mailer, adapter: Swoosh.Adapters.Local
 
 # ## SSL Support
 #
@@ -60,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.migrated.secret.exs"),
+  do: import_config("./config/dev.migrated.secret.exs")