X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=config%2Fdev.exs;h=7e1e3b4beb2a5add28c054f79f71c3ee328708ae;hb=4f004ab92e6d824140e1f87155c3f91a6eedcb09;hp=a697d3a24d2dcfef50de9561a22cdc8e4317e3db;hpb=13ea3eafe544f6d7d3e755505b4431dce119bcce;p=akkoma

diff --git a/config/dev.exs b/config/dev.exs
index a697d3a24..7e1e3b4be 100644
--- a/config/dev.exs
+++ b/config/dev.exs
@@ -7,12 +7,18 @@ use Mix.Config
 # watchers to your application. For example, we use it
 # with brunch.io to recompile .js and .css sources.
 config :pleroma, Pleroma.Web.Endpoint,
-  http: [port: 4000, protocol_options: [max_request_line_length: 8192, max_header_value_length: 8192]],
+  http: [
+    port: 4000,
+    protocol_options: [max_request_line_length: 8192, max_header_value_length: 8192]
+  ],
   protocol: "http",
   debug_errors: true,
   code_reloader: true,
   check_origin: false,
-  watchers: []
+  watchers: [],
+  secure_cookie_flag: false
+
+config :pleroma, Pleroma.Emails.Mailer, adapter: Swoosh.Adapters.Local
 
 # ## SSL Support
 #
@@ -46,8 +52,13 @@ config :pleroma, Pleroma.Repo,
   hostname: "localhost",
   pool_size: 10
 
-try do
+if File.exists?("./config/dev.secret.exs") do
   import_config "dev.secret.exs"
-rescue
-  _-> IO.puts("!!! RUNNING IN LOCALHOST DEV MODE! !!!\nFEDERATION WON'T WORK UNTIL YOU CONFIGURE A dev.secret.exs")
+else
+  IO.puts(
+    "!!! 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")