projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'fix/clause-never-matches' into 'develop'
[akkoma]
/
config
/
config.exs
diff --git
a/config/config.exs
b/config/config.exs
index ddbfb246a32db789d33caecaeab04fc820b896e9..4624bded2a8829592fe5c88eac2c12639ab3805a 100644
(file)
--- a/
config/config.exs
+++ b/
config/config.exs
@@
-59,10
+59,6
@@
scheduled_jobs =
_ -> []
end
_ -> []
end
-scheduled_jobs =
- scheduled_jobs ++
- [{"0 */6 * * * *", {Pleroma.Web.Websub, :refresh_subscriptions, []}}]
-
config :pleroma, Pleroma.Scheduler,
global: true,
overlap: true,
config :pleroma, Pleroma.Scheduler,
global: true,
overlap: true,
@@
-94,7
+90,7
@@
config :pleroma, Pleroma.Captcha.Kocaptcha, endpoint: "https://captcha.kotobank.
config :pleroma, Pleroma.Upload,
uploader: Pleroma.Uploaders.Local,
filters: [Pleroma.Upload.Filter.Dedupe],
config :pleroma, Pleroma.Upload,
uploader: Pleroma.Uploaders.Local,
filters: [Pleroma.Upload.Filter.Dedupe],
- link_name:
tru
e,
+ link_name:
fals
e,
proxy_remote: false,
proxy_opts: [
redirect_on_failure: false,
proxy_remote: false,
proxy_opts: [
redirect_on_failure: false,
@@
-184,7
+180,8
@@
config :pleroma, Pleroma.Web.Endpoint,
# Configures Elixir's Logger
config :logger, :console,
# Configures Elixir's Logger
config :logger, :console,
- format: "$time $metadata[$level] $message\n",
+ level: :debug,
+ format: "\n$time $metadata[$level] $message\n",
metadata: [:request_id]
config :logger, :ex_syslogger,
metadata: [:request_id]
config :logger, :ex_syslogger,
@@
-212,6
+209,7
@@
config :tesla, adapter: Tesla.Adapter.Hackney
config :pleroma, :http,
proxy_url: nil,
send_user_agent: true,
config :pleroma, :http,
proxy_url: nil,
send_user_agent: true,
+ user_agent: :default,
adapter: [
ssl_options: [
# Workaround for remote server certificate chain issues
adapter: [
ssl_options: [
# Workaround for remote server certificate chain issues
@@
-227,6
+225,7
@@
config :pleroma, :instance,
notify_email: "noreply@example.com",
description: "A Pleroma instance, an alternative fediverse server",
limit: 5_000,
notify_email: "noreply@example.com",
description: "A Pleroma instance, an alternative fediverse server",
limit: 5_000,
+ chat_limit: 5_000,
remote_limit: 100_000,
upload_limit: 16_000_000,
avatar_upload_limit: 2_000_000,
remote_limit: 100_000,
upload_limit: 16_000_000,
avatar_upload_limit: 2_000_000,
@@
-243,9
+242,7
@@
config :pleroma, :instance,
federation_incoming_replies_max_depth: 100,
federation_reachability_timeout_days: 7,
federation_publisher_modules: [
federation_incoming_replies_max_depth: 100,
federation_reachability_timeout_days: 7,
federation_publisher_modules: [
- Pleroma.Web.ActivityPub.Publisher,
- Pleroma.Web.Websub,
- Pleroma.Web.Salmon
+ Pleroma.Web.ActivityPub.Publisher
],
allow_relay: true,
rewrite_policy: Pleroma.Web.ActivityPub.MRF.NoOpPolicy,
],
allow_relay: true,
rewrite_policy: Pleroma.Web.ActivityPub.MRF.NoOpPolicy,
@@
-263,7
+260,7
@@
config :pleroma, :instance,
mrf_transparency_exclusions: [],
autofollowed_nicknames: [],
max_pinned_statuses: 1,
mrf_transparency_exclusions: [],
autofollowed_nicknames: [],
max_pinned_statuses: 1,
- no_attachment_links:
fals
e,
+ no_attachment_links:
tru
e,
welcome_user_nickname: nil,
welcome_message: nil,
max_report_comment_size: 1000,
welcome_user_nickname: nil,
welcome_message: nil,
max_report_comment_size: 1000,
@@
-280,7
+277,13
@@
config :pleroma, :instance,
account_field_name_length: 512,
account_field_value_length: 2048,
external_user_synchronization: true,
account_field_name_length: 512,
account_field_value_length: 2048,
external_user_synchronization: true,
- extended_nickname_format: false
+ extended_nickname_format: true
+
+config :pleroma, :feed,
+ post_title: %{
+ max_length: 100,
+ omission: "..."
+ }
config :pleroma, :markup,
# XXX - unfortunately, inline images must be enabled by default right now, because
config :pleroma, :markup,
# XXX - unfortunately, inline images must be enabled by default right now, because
@@
-290,8
+293,8
@@
config :pleroma, :markup,
allow_tables: false,
allow_fonts: false,
scrub_policy: [
allow_tables: false,
allow_fonts: false,
scrub_policy: [
- Pleroma.HTML.
Transform.MediaProxy
,
- Pleroma.HTML.
Scrubber.Default
+ Pleroma.HTML.
Scrubber.Default
,
+ Pleroma.HTML.
Transform.MediaProxy
]
config :pleroma, :frontend_configurations,
]
config :pleroma, :frontend_configurations,
@@
-328,6
+331,16
@@
config :pleroma, :assets,
],
default_mascot: :pleroma_fox_tan
],
default_mascot: :pleroma_fox_tan
+config :pleroma, :manifest,
+ icons: [
+ %{
+ src: "/static/logo.png",
+ type: "image/png"
+ }
+ ],
+ theme_color: "#282c37",
+ background_color: "#191b22"
+
config :pleroma, :activitypub,
unfollow_blocked: true,
outgoing_blocks: true,
config :pleroma, :activitypub,
unfollow_blocked: true,
outgoing_blocks: true,
@@
-371,6
+384,10
@@
config :pleroma, :mrf_vocabulary,
accept: [],
reject: []
accept: [],
reject: []
+config :pleroma, :mrf_object_age,
+ threshold: 172_800,
+ actions: [:delist, :strip_followers]
+
config :pleroma, :rich_media,
enabled: true,
ignore_hosts: [],
config :pleroma, :rich_media,
enabled: true,
ignore_hosts: [],
@@
-409,7
+426,8
@@
config :pleroma, Pleroma.Web.Metadata,
providers: [
Pleroma.Web.Metadata.Providers.OpenGraph,
Pleroma.Web.Metadata.Providers.TwitterCard,
providers: [
Pleroma.Web.Metadata.Providers.OpenGraph,
Pleroma.Web.Metadata.Providers.TwitterCard,
- Pleroma.Web.Metadata.Providers.RelMe
+ Pleroma.Web.Metadata.Providers.RelMe,
+ Pleroma.Web.Metadata.Providers.Feed
],
unfurl_nsfw: false
],
unfurl_nsfw: false
@@
-588,16
+606,19
@@
config :pleroma, :env, Mix.env()
config :http_signatures,
adapter: Pleroma.Signature
config :http_signatures,
adapter: Pleroma.Signature
-config :pleroma, :rate_limit,
nil
+config :pleroma, :rate_limit,
authentication: {60_000, 15}
config :pleroma, Pleroma.ActivityExpiration, enabled: true
config :pleroma, Pleroma.Plugs.RemoteIp, enabled: false
config :pleroma, Pleroma.ActivityExpiration, enabled: true
config :pleroma, Pleroma.Plugs.RemoteIp, enabled: false
+config :pleroma, :static_fe, enabled: false
+
config :pleroma, :web_cache_ttl,
activity_pub: nil,
activity_pub_question: 30_000
config :pleroma, :web_cache_ttl,
activity_pub: nil,
activity_pub_question: 30_000
+config :swarm, node_blacklist: [~r/myhtml_.*$/]
# 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"