Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop: (207 commits) Update README.md Mastodon API: Fix list streaming nginx example config: remove CORS headers, now managed by CORSPlug. config: properly configure CORSPlug. oauth: fix token decode regression tests: add test for internal data stripping activitypub: transmogrifier: sanitize internal representation details from outgoing objects lib/mix/tasks: s/@doc/@moduledoc/ lib/mix/tasks/unsubscribe_user.ex: Fix syntax from bad line copy lib/mix/tasks: Add remaining documentation for mix tasks config/config.md: Add lines inspired/copied from CONFIGURATION.md README.md: Add note about config/config.md README.md: Put the systemd’s .service note to the relevant section README.md: Add note for OpenRC config/config.md: scope_options_enabled also addresses subject config/config.md: Fill all the blanks config/config.md: Complete it [WIP] config/config.md: Create Document the mix tasks in ex_doc instead Document mix tasks ...
This commit is contained in:
commit
bc0f261f72
127 changed files with 3151 additions and 912 deletions
|
|
@ -20,11 +20,28 @@ config :pleroma, Pleroma.Uploaders.Local,
|
|||
|
||||
config :pleroma, Pleroma.Uploaders.S3,
|
||||
bucket: nil,
|
||||
public_endpoint: "https://s3.amazonaws.com"
|
||||
public_endpoint: "https://s3.amazonaws.com",
|
||||
force_media_proxy: false
|
||||
|
||||
config :pleroma, :emoji, shortcode_globs: ["/emoji/custom/**/*.png"]
|
||||
|
||||
config :pleroma, :uri_schemes, additionnal_schemes: []
|
||||
config :pleroma, :uri_schemes,
|
||||
valid_schemes: [
|
||||
"https",
|
||||
"http",
|
||||
"dat",
|
||||
"dweb",
|
||||
"gopher",
|
||||
"ipfs",
|
||||
"ipns",
|
||||
"irc",
|
||||
"ircs",
|
||||
"magnet",
|
||||
"mailto",
|
||||
"mumble",
|
||||
"ssb",
|
||||
"xmpp"
|
||||
]
|
||||
|
||||
# Configures the endpoint
|
||||
config :pleroma, Pleroma.Web.Endpoint,
|
||||
|
|
@ -68,12 +85,23 @@ config :pleroma, :instance,
|
|||
description: "SigSegV, a pleroma instance",
|
||||
limit: 5000,
|
||||
upload_limit: 20_000_000,
|
||||
avatar_upload_limit: 2_000_000,
|
||||
background_upload_limit: 4_000_000,
|
||||
banner_upload_limit: 4_000_000,
|
||||
registrations_open: true,
|
||||
federating: true,
|
||||
allow_relay: true,
|
||||
rewrite_policy: Pleroma.Web.ActivityPub.MRF.NoOpPolicy,
|
||||
public: true,
|
||||
quarantined_instances: ["pleroma.rareome.ga"]
|
||||
managed_config: true,
|
||||
allowed_post_formats: [
|
||||
"text/plain",
|
||||
"text/html",
|
||||
"text/markdown"
|
||||
],
|
||||
finmoji_enabled: true,
|
||||
mrf_transparency: true
|
||||
|
||||
config :pleroma, :markup,
|
||||
# XXX - unfortunately, inline images must be enabled by default right now, because
|
||||
|
|
@ -96,13 +124,17 @@ config :pleroma, :fe,
|
|||
redirect_root_no_login: "/main/all",
|
||||
redirect_root_login: "/main/friends",
|
||||
show_instance_panel: true,
|
||||
scope_options_enabled: true,
|
||||
collapse_message_with_subject: false
|
||||
scope_options_enabled: false,
|
||||
formatting_options_enabled: false,
|
||||
collapse_message_with_subject: false,
|
||||
hide_post_stats: false,
|
||||
hide_user_stats: false
|
||||
|
||||
config :pleroma, :activitypub,
|
||||
accept_blocks: true,
|
||||
unfollow_blocked: true,
|
||||
outgoing_blocks: true
|
||||
outgoing_blocks: true,
|
||||
follow_handshake_timeout: 500
|
||||
|
||||
config :pleroma, :user, deny_follow_blocked: true
|
||||
|
||||
|
|
@ -144,6 +176,20 @@ config :pleroma, :suggestions,
|
|||
limit: 23,
|
||||
web: "https://vinayaka.distsn.org/?{{host}}+{{user}}"
|
||||
|
||||
config :cors_plug,
|
||||
max_age: 86_400,
|
||||
methods: ["POST", "PUT", "DELETE", "GET", "PATCH", "OPTIONS"],
|
||||
expose: [
|
||||
"Link",
|
||||
"X-RateLimit-Reset",
|
||||
"X-RateLimit-Limit",
|
||||
"X-RateLimit-Remaining",
|
||||
"X-Request-Id",
|
||||
"Idempotency-Key"
|
||||
],
|
||||
credentials: true,
|
||||
headers: ["Authorization", "Content-Type", "Idempotency-Key"]
|
||||
|
||||
# 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"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue