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 c7e0cf09f798771d79de6d16c74d0706c8ebc901..a5b49a839e9f42fe0f1e5adb4dedb4f5e234411c 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,
@@
-70,9
+66,11
@@
config :pleroma, Pleroma.Scheduler,
jobs: scheduled_jobs
config :pleroma, Pleroma.Captcha,
jobs: scheduled_jobs
config :pleroma, Pleroma.Captcha,
- enabled: false,
- seconds_valid: 60,
- method: Pleroma.Captcha.Kocaptcha
+ enabled: true,
+ seconds_valid: 300,
+ method: Pleroma.Captcha.Native
+
+config :pleroma, Pleroma.Captcha.Kocaptcha, endpoint: "https://captcha.kotobank.ch"
config :pleroma, :hackney_pools,
federation: [
config :pleroma, :hackney_pools,
federation: [
@@
-88,13
+86,11
@@
config :pleroma, :hackney_pools,
timeout: 300_000
]
timeout: 300_000
]
-config :pleroma, Pleroma.Captcha.Kocaptcha, endpoint: "https://captcha.kotobank.ch"
-
# Upload configuration
config :pleroma, Pleroma.Upload,
uploader: Pleroma.Uploaders.Local,
filters: [Pleroma.Upload.Filter.Dedupe],
# Upload configuration
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,
@@
-109,20
+105,17
@@
config :pleroma, Pleroma.Uploaders.Local, uploads: "uploads"
config :pleroma, Pleroma.Uploaders.S3,
bucket: nil,
config :pleroma, Pleroma.Uploaders.S3,
bucket: nil,
+ streaming_enabled: true,
public_endpoint: "https://s3.amazonaws.com"
public_endpoint: "https://s3.amazonaws.com"
-config :pleroma, Pleroma.Uploaders.MDII,
- cgi: "https://mdii.sakura.ne.jp/mdii-post.cgi",
- files: "https://mdii.sakura.ne.jp"
-
config :pleroma, :emoji,
shortcode_globs: ["/emoji/custom/**/*.png"],
pack_extensions: [".png", ".gif"],
groups: [
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"]
],
Custom: ["/emoji/*.png", "/emoji/**/*.png"]
],
- default_manifest: "https://git.pleroma.social/pleroma/emoji-index/raw/master/index.json"
+ default_manifest: "https://git.pleroma.social/pleroma/emoji-index/raw/master/index.json",
+ shared_pack_cache_seconds_per_file: 60
config :pleroma, :uri_schemes,
valid_schemes: [
config :pleroma, :uri_schemes,
valid_schemes: [
@@
-182,7
+175,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,
@@
-210,6
+204,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
@@
-225,6
+220,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,
@@
-241,9
+237,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,
@@
-259,9
+253,10
@@
config :pleroma, :instance,
],
mrf_transparency: true,
mrf_transparency_exclusions: [],
],
mrf_transparency: true,
mrf_transparency_exclusions: [],
+ staff_transparency: [],
autofollowed_nicknames: [],
max_pinned_statuses: 1,
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,
@@
-270,14
+265,20
@@
config :pleroma, :instance,
remote_post_retention_days: 90,
skip_thread_containment: true,
limit_to_local_content: :unauthenticated,
remote_post_retention_days: 90,
skip_thread_containment: true,
limit_to_local_content: :unauthenticated,
- dynamic_configuration: false,
user_bio_length: 5000,
user_name_length: 100,
max_account_fields: 10,
max_remote_account_fields: 20,
account_field_name_length: 512,
account_field_value_length: 2048,
user_bio_length: 5000,
user_name_length: 100,
max_account_fields: 10,
max_remote_account_fields: 20,
account_field_name_length: 512,
account_field_value_length: 2048,
- external_user_synchronization: true
+ external_user_synchronization: true,
+ 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
@@
-287,8
+288,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,
@@
-325,6
+326,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,
@@
-368,6
+379,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: [],
@@
-406,18
+421,11
@@
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
-config :pleroma, :suggestions,
- enabled: false,
- third_party_engine:
- "http://vinayaka.distsn.org/cgi-bin/vinayaka-user-match-suggestions-api.cgi?{{host}}+{{user}}",
- timeout: 300_000,
- limit: 40,
- web: "https://vinayaka.distsn.org"
-
config :pleroma, :http_security,
enabled: true,
sts: false,
config :pleroma, :http_security,
enabled: true,
sts: false,
@@
-485,7
+493,8
@@
config :pleroma, Oban,
mailer: 10,
transmogrifier: 20,
scheduled_activities: 10,
mailer: 10,
transmogrifier: 20,
scheduled_activities: 10,
- background: 5
+ background: 5,
+ attachments_cleanup: 5
]
config :pleroma, :workers,
]
config :pleroma, :workers,
@@
-507,7
+516,7
@@
config :auto_linker,
class: false,
strip_prefix: false,
new_window: false,
class: false,
strip_prefix: false,
new_window: false,
- rel:
false
+ rel:
"ugc"
]
config :pleroma, :ldap,
]
config :pleroma, :ldap,
@@
-542,7
+551,10
@@
config :ueberauth,
base_path: "/oauth",
providers: ueberauth_providers
base_path: "/oauth",
providers: ueberauth_providers
-config :pleroma, :auth, oauth_consumer_strategies: oauth_consumer_strategies
+config :pleroma,
+ :auth,
+ enforce_oauth_admin_scope_usage: true,
+ oauth_consumer_strategies: oauth_consumer_strategies
config :pleroma, Pleroma.Emails.Mailer, adapter: Swoosh.Adapters.Sendmail, enabled: false
config :pleroma, Pleroma.Emails.Mailer, adapter: Swoosh.Adapters.Sendmail, enabled: false
@@
-585,14
+597,23
@@
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.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 :pleroma, :modules, runtime_dir: "instance/modules"
+
+config :pleroma, configurable_from_database: false
+
+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"