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

diff --git a/config/dev.exs b/config/dev.exs
index 7b06ad67e..8f89aa03c 100644
--- a/config/dev.exs
+++ b/config/dev.exs
@@ -12,11 +12,14 @@ 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: []
 
+config :pleroma, Pleroma.Mailer, adapter: Swoosh.Adapters.Local
+
 # ## SSL Support
 #
 # In order to use HTTPS in development, a self-signed
@@ -49,11 +52,10 @@ 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