Merge remote-tracking branch 'remotes/origin/develop' into twitter_oauth

[akkoma] / config / dev.exs

diff --git a/config/dev.exs b/config/dev.exs
index 7b06ad67ece9541d79fd20c28f8c2e68cf5f984a..a7eb4b6444efdd9da385206a15977f25cf6731eb 100644 (file)
--- a/config/dev.exs
+++ b/config/dev.exs
@@ -15,7 +15,10 @@ config :pleroma, Pleroma.Web.Endpoint,
   debug_errors: true,
   code_reloader: true,
   check_origin: false,
-  watchers: []
+  watchers: [],
+  secure_cookie_flag: false
+
+config :pleroma, Pleroma.Mailer, adapter: Swoosh.Adapters.Local
 
 # ## SSL Support
 #
@@ -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