Merge branch 'develop' into 'remove-avatar-header'

[akkoma] / config / dev.exs

diff --git a/config/dev.exs b/config/dev.exs
index f77bb99765f4014bb51db91b3fc8fb318ed8f3bd..7e1e3b4beb2a5add28c054f79f71c3ee328708ae 100644 (file)
--- 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.exported_from_db.secret.exs"),
+  do: import_config("dev.exported_from_db.secret.exs")