projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Improve descriptions, move primary MRF settings to top for AdminFE ordering
[akkoma]
/
config
/
config.exs
diff --git
a/config/config.exs
b/config/config.exs
index e0888fa9a49555f62eb712ba41ba8f189c215340..9b550920cb144e469eda74394f67079e133cce37 100644
(file)
--- a/
config/config.exs
+++ b/
config/config.exs
@@
-210,7
+210,6
@@
config :pleroma, :instance,
Pleroma.Web.ActivityPub.Publisher
],
allow_relay: true,
Pleroma.Web.ActivityPub.Publisher
],
allow_relay: true,
- rewrite_policy: Pleroma.Web.ActivityPub.MRF.NoOpPolicy,
public: true,
quarantined_instances: [],
managed_config: true,
public: true,
quarantined_instances: [],
managed_config: true,
@@
-221,8
+220,6
@@
config :pleroma, :instance,
"text/markdown",
"text/bbcode"
],
"text/markdown",
"text/bbcode"
],
- mrf_transparency: true,
- mrf_transparency_exclusions: [],
autofollowed_nicknames: [],
max_pinned_statuses: 1,
attachment_links: false,
autofollowed_nicknames: [],
max_pinned_statuses: 1,
attachment_links: false,
@@
-437,6
+434,12
@@
config :pleroma, Pleroma.Web.Metadata,
],
unfurl_nsfw: false
],
unfurl_nsfw: false
+config :pleroma, Pleroma.Web.Preload,
+ providers: [
+ Pleroma.Web.Preload.Providers.Instance,
+ Pleroma.Web.Preload.Providers.StatusNet
+ ]
+
config :pleroma, :http_security,
enabled: true,
sts: false,
config :pleroma, :http_security,
enabled: true,
sts: false,
@@
-693,6
+696,15
@@
config :pleroma, :restrict_unauthenticated,
config :pleroma, Pleroma.Web.ApiSpec.CastAndValidate, strict: false
config :pleroma, Pleroma.Web.ApiSpec.CastAndValidate, strict: false
+config :pleroma, :mrf,
+ policies: Pleroma.Web.ActivityPub.MRF.NoOpPolicy,
+ transparency: true,
+ transparency_exclusions: []
+
+config :tzdata, :http_client, Pleroma.HTTP.Tzdata
+
+config :ex_aws, http_client: Pleroma.HTTP.ExAws
+
# 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"