projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'fix/twitter-rich-media-preview' into 'develop'
[akkoma]
/
config
/
dev.exs
diff --git
a/config/dev.exs
b/config/dev.exs
index 8f89aa03c3d4a68e0097a652fc9e24f6d1c5c2af..4faaeff5bfbf7881f72468a3a33d44b4f8a6abf9 100644
(file)
--- a/
config/dev.exs
+++ b/
config/dev.exs
@@
-12,13
+12,13
@@
config :pleroma, Pleroma.Web.Endpoint,
protocol_options: [max_request_line_length: 8192, max_header_value_length: 8192]
],
protocol: "http",
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,
debug_errors: true,
code_reloader: true,
check_origin: false,
- watchers: []
+ watchers: [],
+ secure_cookie_flag: false
-config :pleroma, Pleroma.Mailer, adapter: Swoosh.Adapters.Local
+config :pleroma, Pleroma.
Emails.
Mailer, adapter: Swoosh.Adapters.Local
# ## SSL Support
#
# ## SSL Support
#
@@
-52,6
+52,8
@@
config :pleroma, Pleroma.Repo,
hostname: "localhost",
pool_size: 10
hostname: "localhost",
pool_size: 10
+config :pleroma, Pleroma.Web.ApiSpec.CastAndValidate, strict: true
+
if File.exists?("./config/dev.secret.exs") do
import_config "dev.secret.exs"
else
if File.exists?("./config/dev.secret.exs") do
import_config "dev.secret.exs"
else
@@
-59,3
+61,6
@@
else
"!!! RUNNING IN LOCALHOST DEV MODE! !!!\nFEDERATION WON'T WORK UNTIL YOU CONFIGURE A dev.secret.exs"
)
end
"!!! 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")