Merge branch 'develop' into gun
This commit is contained in:
Alexander Strizhakov
commit
814b275af7
208 changed files with 1946 additions and 2688 deletions
|
|
@ -198,6 +198,8 @@ config :pleroma, :instance,
|
|||
max_expiration: 365 * 24 * 60 * 60
|
||||
},
|
||||
registrations_open: true,
|
||||
invites_enabled: false,
|
||||
account_activation_required: false,
|
||||
federating: true,
|
||||
federation_incoming_replies_max_depth: 100,
|
||||
federation_reachability_timeout_days: 7,
|
||||
|
|
@ -305,6 +307,7 @@ config :pleroma, :activitypub,
|
|||
unfollow_blocked: true,
|
||||
outgoing_blocks: true,
|
||||
follow_handshake_timeout: 500,
|
||||
note_replies_output_limit: 5,
|
||||
sign_object_fetches: true,
|
||||
authorized_fetch_mode: false
|
||||
|
||||
|
|
@ -378,6 +381,8 @@ config :phoenix, :format_encoders, json: Jason
|
|||
|
||||
config :phoenix, :json_library, Jason
|
||||
|
||||
config :phoenix, :filter_parameters, ["password", "confirm"]
|
||||
|
||||
config :pleroma, :gopher,
|
||||
enabled: false,
|
||||
ip: {0, 0, 0, 0},
|
||||
|
|
@ -460,6 +465,7 @@ config :pleroma, Oban,
|
|||
transmogrifier: 20,
|
||||
scheduled_activities: 10,
|
||||
background: 5,
|
||||
remote_fetcher: 2,
|
||||
attachments_cleanup: 5,
|
||||
new_users_digest: 1
|
||||
],
|
||||
|
|
|
|||
|
|
@ -662,7 +662,7 @@ config :pleroma, :config_description, [
|
|||
label: "Fed. incoming replies max depth",
|
||||
type: :integer,
|
||||
description:
|
||||
"Max. depth of reply-to activities fetching on incoming federation, to prevent out-of-memory situations while" <>
|
||||
"Max. depth of reply-to and reply activities fetching on incoming federation, to prevent out-of-memory situations while" <>
|
||||
" fetching very long threads. If set to `nil`, threads of any depth will be fetched. Lower this value if you experience out-of-memory crashes.",
|
||||
suggestions: [
|
||||
100
|
||||
|
|
@ -1615,160 +1615,6 @@ config :pleroma, :config_description, [
|
|||
}
|
||||
]
|
||||
},
|
||||
%{
|
||||
group: :pleroma,
|
||||
key: Pleroma.Web.Endpoint,
|
||||
type: :group,
|
||||
description: "Phoenix endpoint configuration",
|
||||
children: [
|
||||
%{
|
||||
key: :http,
|
||||
label: "HTTP",
|
||||
type: {:keyword, :integer, :tuple},
|
||||
description: "http protocol configuration",
|
||||
suggestions: [
|
||||
port: 8080,
|
||||
ip: {127, 0, 0, 1}
|
||||
],
|
||||
children: [
|
||||
%{
|
||||
key: :dispatch,
|
||||
type: {:list, :tuple},
|
||||
description: "dispatch settings",
|
||||
suggestions: [
|
||||
{:_,
|
||||
[
|
||||
{"/api/v1/streaming", Pleroma.Web.MastodonAPI.WebsocketHandler, []},
|
||||
{"/websocket", Phoenix.Endpoint.CowboyWebSocket,
|
||||
{Phoenix.Transports.WebSocket,
|
||||
{Pleroma.Web.Endpoint, Pleroma.Web.UserSocket, websocket_config}}},
|
||||
{:_, Phoenix.Endpoint.Cowboy2Handler, {Pleroma.Web.Endpoint, []}}
|
||||
]}
|
||||
# end copied from config.exs
|
||||
]
|
||||
},
|
||||
%{
|
||||
key: :ip,
|
||||
label: "IP",
|
||||
type: :tuple,
|
||||
description: "ip",
|
||||
suggestions: [
|
||||
{0, 0, 0, 0}
|
||||
]
|
||||
},
|
||||
%{
|
||||
key: :port,
|
||||
type: :integer,
|
||||
description: "port",
|
||||
suggestions: [
|
||||
2020
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
%{
|
||||
key: :url,
|
||||
label: "URL",
|
||||
type: {:keyword, :string, :integer},
|
||||
description: "configuration for generating urls",
|
||||
suggestions: [
|
||||
host: "example.com",
|
||||
port: 2020,
|
||||
scheme: "https"
|
||||
],
|
||||
children: [
|
||||
%{
|
||||
key: :host,
|
||||
type: :string,
|
||||
description: "Host",
|
||||
suggestions: [
|
||||
"example.com"
|
||||
]
|
||||
},
|
||||
%{
|
||||
key: :port,
|
||||
type: :integer,
|
||||
description: "port",
|
||||
suggestions: [
|
||||
2020
|
||||
]
|
||||
},
|
||||
%{
|
||||
key: :scheme,
|
||||
type: :string,
|
||||
description: "Scheme",
|
||||
suggestions: [
|
||||
"https",
|
||||
"https"
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
%{
|
||||
key: :instrumenters,
|
||||
type: {:list, :module},
|
||||
suggestions: [Pleroma.Web.Endpoint.Instrumenter]
|
||||
},
|
||||
%{
|
||||
key: :protocol,
|
||||
type: :string,
|
||||
suggestions: ["https"]
|
||||
},
|
||||
%{
|
||||
key: :secret_key_base,
|
||||
type: :string,
|
||||
suggestions: ["aK4Abxf29xU9TTDKre9coZPUgevcVCFQJe/5xP/7Lt4BEif6idBIbjupVbOrbKxl"]
|
||||
},
|
||||
%{
|
||||
key: :signing_salt,
|
||||
type: :string,
|
||||
suggestions: ["CqaoopA2"]
|
||||
},
|
||||
%{
|
||||
key: :render_errors,
|
||||
type: :keyword,
|
||||
suggestions: [view: Pleroma.Web.ErrorView, accepts: ~w(json)],
|
||||
children: [
|
||||
%{
|
||||
key: :view,
|
||||
type: :module,
|
||||
suggestions: [Pleroma.Web.ErrorView]
|
||||
},
|
||||
%{
|
||||
key: :accepts,
|
||||
type: {:list, :string},
|
||||
suggestions: ["json"]
|
||||
}
|
||||
]
|
||||
},
|
||||
%{
|
||||
key: :pubsub,
|
||||
type: :keyword,
|
||||
suggestions: [name: Pleroma.PubSub, adapter: Phoenix.PubSub.PG2],
|
||||
children: [
|
||||
%{
|
||||
key: :name,
|
||||
type: :module,
|
||||
suggestions: [Pleroma.PubSub]
|
||||
},
|
||||
%{
|
||||
key: :adapter,
|
||||
type: :module,
|
||||
suggestions: [Phoenix.PubSub.PG2]
|
||||
}
|
||||
]
|
||||
},
|
||||
%{
|
||||
key: :secure_cookie_flag,
|
||||
type: :boolean
|
||||
},
|
||||
%{
|
||||
key: :extra_cookie_attrs,
|
||||
type: {:list, :string},
|
||||
suggestions: ["SameSite=Lax"]
|
||||
}
|
||||
]
|
||||
},
|
||||
%{
|
||||
group: :pleroma,
|
||||
key: :activitypub,
|
||||
|
|
@ -1790,6 +1636,12 @@ config :pleroma, :config_description, [
|
|||
type: :boolean,
|
||||
description: "Sign object fetches with HTTP signatures"
|
||||
},
|
||||
%{
|
||||
key: :note_replies_output_limit,
|
||||
type: :integer,
|
||||
description:
|
||||
"The number of Note replies' URIs to be included with outgoing federation (`5` to match Mastodon hardcoded value, `0` to disable the output)."
|
||||
},
|
||||
%{
|
||||
key: :follow_handshake_timeout,
|
||||
type: :integer,
|
||||
|
|
@ -2588,19 +2440,6 @@ config :pleroma, :config_description, [
|
|||
}
|
||||
]
|
||||
},
|
||||
%{
|
||||
group: :pleroma,
|
||||
key: :database,
|
||||
type: :group,
|
||||
description: "Database related settings",
|
||||
children: [
|
||||
%{
|
||||
key: :rum_enabled,
|
||||
type: :boolean,
|
||||
description: "If RUM indexes should be used. Default: disabled"
|
||||
}
|
||||
]
|
||||
},
|
||||
%{
|
||||
group: :pleroma,
|
||||
key: :rate_limit,
|
||||
|
|
@ -2764,20 +2603,6 @@ config :pleroma, :config_description, [
|
|||
}
|
||||
]
|
||||
},
|
||||
%{
|
||||
group: :prometheus,
|
||||
key: Pleroma.Web.Endpoint.MetricsExporter,
|
||||
type: :group,
|
||||
description: "Prometheus settings",
|
||||
children: [
|
||||
%{
|
||||
key: :path,
|
||||
type: :string,
|
||||
description: "API endpoint with metrics",
|
||||
suggestions: ["/api/pleroma/app_metrics"]
|
||||
}
|
||||
]
|
||||
},
|
||||
%{
|
||||
group: :http_signatures,
|
||||
type: :group,
|
||||
|
|
@ -3045,7 +2870,7 @@ config :pleroma, :config_description, [
|
|||
group: :pleroma,
|
||||
key: :feed,
|
||||
type: :group,
|
||||
description: "Configure feed rendering.",
|
||||
description: "Configure feed rendering",
|
||||
children: [
|
||||
%{
|
||||
key: :post_title,
|
||||
|
|
@ -3095,7 +2920,7 @@ config :pleroma, :config_description, [
|
|||
group: :pleroma,
|
||||
key: :modules,
|
||||
type: :group,
|
||||
description: "Custom Runtime Modules.",
|
||||
description: "Custom Runtime Modules",
|
||||
children: [
|
||||
%{
|
||||
key: :runtime_dir,
|
||||
|
|
@ -3103,18 +2928,5 @@ config :pleroma, :config_description, [
|
|||
description: "A path to custom Elixir modules (such as MRF policies)."
|
||||
}
|
||||
]
|
||||
},
|
||||
%{
|
||||
group: :pleroma,
|
||||
type: :group,
|
||||
description: "Allow instance configuration from database.",
|
||||
children: [
|
||||
%{
|
||||
key: :configurable_from_database,
|
||||
type: :boolean,
|
||||
description:
|
||||
"Allow transferring configuration to DB with the subsequent customization from Admin api. Default: disabled"
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue