projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix migration
[akkoma]
/
config
/
config.exs
diff --git
a/config/config.exs
b/config/config.exs
index 3962ac019cd862ce36b5d03ea6f82fdbf28f91e3..e337f00aaa02a65d46d73b21741db7bfb6f3bfdd 100644
(file)
--- a/
config/config.exs
+++ b/
config/config.exs
@@
-99,6
+99,7
@@
config :pleroma, Pleroma.Uploaders.MDII,
config :pleroma, :emoji,
shortcode_globs: ["/emoji/custom/**/*.png"],
config :pleroma, :emoji,
shortcode_globs: ["/emoji/custom/**/*.png"],
+ pack_extensions: [".png", ".gif"],
groups: [
# Put groups that have higher priority than defaults here. Example in `docs/config/custom_emoji.md`
Custom: ["/emoji/*.png", "/emoji/**/*.png"]
groups: [
# Put groups that have higher priority than defaults here. Example in `docs/config/custom_emoji.md`
Custom: ["/emoji/*.png", "/emoji/**/*.png"]
@@
-139,6
+140,7
@@
config :pleroma, Pleroma.Web.Endpoint,
instrumenters: [Pleroma.Web.Endpoint.Instrumenter],
url: [host: "localhost"],
http: [
instrumenters: [Pleroma.Web.Endpoint.Instrumenter],
url: [host: "localhost"],
http: [
+ ip: {127, 0, 0, 1},
dispatch: [
{:_,
[
dispatch: [
{:_,
[
@@
-167,7
+169,7
@@
config :logger, :console,
config :logger, :ex_syslogger,
level: :debug,
config :logger, :ex_syslogger,
level: :debug,
- ident: "
P
leroma",
+ ident: "
p
leroma",
format: "$metadata[$level] $message",
metadata: [:request_id]
format: "$metadata[$level] $message",
metadata: [:request_id]
@@
-329,7
+331,10
@@
config :pleroma, :mrf_keyword,
config :pleroma, :mrf_subchain, match_actor: %{}
config :pleroma, :mrf_subchain, match_actor: %{}
-config :pleroma, :rich_media, enabled: true
+config :pleroma, :rich_media,
+ enabled: true,
+ ignore_hosts: [],
+ ignore_tld: ["local", "localdomain", "lan"]
config :pleroma, :media_proxy,
enabled: false,
config :pleroma, :media_proxy,
enabled: false,