Merge branch 'hellthread-filter-fix' into 'develop'

[akkoma] / config / dev.exs

diff --git a/config/dev.exs b/config/dev.exs
index 7b06ad67ece9541d79fd20c28f8c2e68cf5f984a..f77bb99765f4014bb51db91b3fc8fb318ed8f3bd 100644 (file)
--- a/config/dev.exs
+++ b/config/dev.exs
@@ -12,10 +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: []
+  watchers: [],
+  secure_cookie_flag: false
+
+config :pleroma, Pleroma.Mailer, adapter: Swoosh.Adapters.Local
 
 # ## SSL Support
 #
@@ -49,11 +53,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