Merge branch 'begone-the-dot-hack' into 'develop'

[akkoma] / config / dev.exs

diff --git a/config/dev.exs b/config/dev.exs
index 8f89aa03c3d4a68e0097a652fc9e24f6d1c5c2af..71b11f7c3ebb0b3dc604cdf602fc6dc903cedf47 100644 (file)
--- 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.migrated.secret.exs"),
+  do: import_config("./config/dev.migrated.secret.exs")