projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '1794-hashtags-construction-from-uri' into 'develop'
[akkoma]
/
config
/
config.exs
diff --git
a/config/config.exs
b/config/config.exs
index 7b99a41aa96632f7264a88d899d799461cd19701..9508ae07718a24ddfb906506b150154edaa5527b 100644
(file)
--- a/
config/config.exs
+++ b/
config/config.exs
@@
-71,7
+71,8
@@
config :pleroma, Pleroma.Upload,
follow_redirect: true,
pool: :upload
]
follow_redirect: true,
pool: :upload
]
- ]
+ ],
+ filename_display_max_length: 30
config :pleroma, Pleroma.Uploaders.Local, uploads: "uploads"
config :pleroma, Pleroma.Uploaders.Local, uploads: "uploads"
@@
-170,7
+171,8
@@
config :mime, :types, %{
"application/ld+json" => ["activity+json"]
}
"application/ld+json" => ["activity+json"]
}
-config :tesla, adapter: Tesla.Adapter.Gun
+config :tesla, adapter: Tesla.Adapter.Hackney
+
# Configures http settings, upstream proxy etc.
config :pleroma, :http,
proxy_url: nil,
# Configures http settings, upstream proxy etc.
config :pleroma, :http,
proxy_url: nil,
@@
-182,7
+184,8
@@
config :pleroma, :instance,
name: "Pleroma",
email: "example@example.com",
notify_email: "noreply@example.com",
name: "Pleroma",
email: "example@example.com",
notify_email: "noreply@example.com",
- description: "A Pleroma instance, an alternative fediverse server",
+ description: "Pleroma: An efficient and flexible fediverse server",
+ background_image: "/images/city.jpg",
limit: 5_000,
chat_limit: 5_000,
remote_limit: 100_000,
limit: 5_000,
chat_limit: 5_000,
remote_limit: 100_000,
@@
-272,7
+275,7
@@
config :pleroma, :markup,
config :pleroma, :frontend_configurations,
pleroma_fe: %{
alwaysShowSubjectInput: true,
config :pleroma, :frontend_configurations,
pleroma_fe: %{
alwaysShowSubjectInput: true,
- background: "/
static/aurora_borealis
.jpg",
+ background: "/
images/city
.jpg",
collapseMessageWithSubject: false,
disableChat: false,
greentext: false,
collapseMessageWithSubject: false,
disableChat: false,
greentext: false,
@@
-292,6
+295,7
@@
config :pleroma, :frontend_configurations,
redirectRootLogin: "/main/friends",
redirectRootNoLogin: "/main/all",
scopeCopy: true,
redirectRootLogin: "/main/friends",
redirectRootNoLogin: "/main/all",
scopeCopy: true,
+ sidebarRight: false,
showFeaturesPanel: true,
showInstanceSpecificPanel: false,
subjectLineBehavior: "email",
showFeaturesPanel: true,
showInstanceSpecificPanel: false,
subjectLineBehavior: "email",
@@
-388,6
+392,10
@@
config :pleroma, :rich_media,
config :pleroma, :media_proxy,
enabled: false,
config :pleroma, :media_proxy,
enabled: false,
+ invalidation: [
+ enabled: false,
+ provider: Pleroma.Web.MediaProxy.Invalidation.Script
+ ],
proxy_opts: [
redirect_on_failure: false,
max_body_length: 25 * 1_048_576,
proxy_opts: [
redirect_on_failure: false,
max_body_length: 25 * 1_048_576,