projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
[akkoma]
/
config
/
config.exs
diff --git
a/config/config.exs
b/config/config.exs
index bd559c835578ff9f77d9c765824f88247cebb4f2..acbb7639a6bfca7bd48b08cd08904bcb3eef89f6 100644
(file)
--- a/
config/config.exs
+++ b/
config/config.exs
@@
-97,6
+97,7
@@
config :pleroma, :uri_schemes,
"dat",
"dweb",
"gopher",
"dat",
"dweb",
"gopher",
+ "hyper",
"ipfs",
"ipns",
"irc",
"ipfs",
"ipns",
"irc",
@@
-188,6
+189,7
@@
config :pleroma, :instance,
background_image: "/images/city.jpg",
instance_thumbnail: "/instance/thumbnail.jpeg",
limit: 5_000,
background_image: "/images/city.jpg",
instance_thumbnail: "/instance/thumbnail.jpeg",
limit: 5_000,
+ description_limit: 5_000,
chat_limit: 5_000,
remote_limit: 100_000,
upload_limit: 16_000_000,
chat_limit: 5_000,
remote_limit: 100_000,
upload_limit: 16_000_000,
@@
-220,6
+222,9
@@
config :pleroma, :instance,
"text/markdown",
"text/bbcode"
],
"text/markdown",
"text/bbcode"
],
+ mrf_transparency: true,
+ mrf_transparency_exclusions: [],
+ staff_transparency: [],
autofollowed_nicknames: [],
max_pinned_statuses: 1,
attachment_links: false,
autofollowed_nicknames: [],
max_pinned_statuses: 1,
attachment_links: false,
@@
-434,6
+439,11
@@
config :pleroma, Pleroma.Web.Metadata,
],
unfurl_nsfw: false
],
unfurl_nsfw: false
+config :pleroma, Pleroma.Web.Preload,
+ providers: [
+ Pleroma.Web.Preload.Providers.Instance
+ ]
+
config :pleroma, :http_security,
enabled: true,
sts: false,
config :pleroma, :http_security,
enabled: true,
sts: false,
@@
-697,6
+707,10
@@
config :pleroma, :mrf,
config :tzdata, :http_client, Pleroma.HTTP.Tzdata
config :tzdata, :http_client, Pleroma.HTTP.Tzdata
+config :ex_aws, http_client: Pleroma.HTTP.ExAws
+
+config :pleroma, :instances_favicons, enabled: false
+
# Import environment specific config. This must remain at the bottom
# of this file so it overrides the configuration defined above.
import_config "#{Mix.env()}.exs"
# Import environment specific config. This must remain at the bottom
# of this file so it overrides the configuration defined above.
import_config "#{Mix.env()}.exs"