diff options
| author | lain <lain@soykaf.club> | 2020-10-26 17:50:34 +0100 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-10-26 17:50:34 +0100 |
| commit | 04b7505c75afbaa1f785b2adaf0313e9b0935fab (patch) | |
| tree | da42147dc907cb7ffcc576b81b16c6c6ed0ef9ad /config | |
| parent | b3d6cf90229ff3e9a5bd0028d4a6cbd3b68da9fe (diff) | |
| parent | 2f7401806bbe5427bbcaa7cdce35130320ae3bb4 (diff) | |
| download | pleroma-04b7505c75afbaa1f785b2adaf0313e9b0935fab.tar.gz pleroma-04b7505c75afbaa1f785b2adaf0313e9b0935fab.zip | |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma-block-behavior
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 5 | ||||
| -rw-r--r-- | config/description.exs | 22 |
2 files changed, 18 insertions, 9 deletions
diff --git a/config/config.exs b/config/config.exs index 0853a5946..5dc05599f 100644 --- a/config/config.exs +++ b/config/config.exs @@ -123,7 +123,6 @@ websocket_config = [ # Configures the endpoint config :pleroma, Pleroma.Web.Endpoint, - instrumenters: [Pleroma.Web.Endpoint.Instrumenter], url: [host: "localhost"], http: [ ip: {127, 0, 0, 1}, @@ -143,7 +142,7 @@ config :pleroma, Pleroma.Web.Endpoint, secret_key_base: "aK4Abxf29xU9TTDKre9coZPUgevcVCFQJe/5xP/7Lt4BEif6idBIbjupVbOrbKxl", signing_salt: "CqaoopA2", render_errors: [view: Pleroma.Web.ErrorView, accepts: ~w(json)], - pubsub: [name: Pleroma.PubSub, adapter: Phoenix.PubSub.PG2], + pubsub_server: Pleroma.PubSub, secure_cookie_flag: true, extra_cookie_attrs: [ "SameSite=Lax" @@ -803,6 +802,8 @@ config :pleroma, :hackney_pools, timeout: 300_000 ] +config :pleroma, :majic_pool, size: 2 + private_instance? = :if_instance_is_private config :pleroma, :restrict_unauthenticated, diff --git a/config/description.exs b/config/description.exs index 6bed8a8d2..7a9bd9cba 100644 --- a/config/description.exs +++ b/config/description.exs @@ -829,13 +829,7 @@ config :pleroma, :config_description, [ key: :autofollowed_nicknames, type: {:list, :string}, description: - "Set to nicknames of (local) users that every new user should automatically follow", - suggestions: [ - "lain", - "kaniini", - "lanodan", - "rinpatch" - ] + "Set to nicknames of (local) users that every new user should automatically follow" }, %{ key: :attachment_links, @@ -3713,5 +3707,19 @@ config :pleroma, :config_description, [ ] } ] + }, + %{ + group: :pleroma, + key: :majic_pool, + type: :group, + description: "Majic/libmagic configuration", + children: [ + %{ + key: :size, + type: :integer, + description: "Number of majic workers to start.", + suggestions: [2] + } + ] } ] |