Merge remote-tracking branch 'pleroma/develop' into feature/disable-account

[akkoma] / config / dev.exs

diff --git a/config/dev.exs b/config/dev.exs
index a697d3a24d2dcfef50de9561a22cdc8e4317e3db..0432adce71bf352d63e45a8978dc71b03658a9f5 100644 (file)
--- 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,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