diff options
| author | lain <lain@soykaf.club> | 2020-07-08 13:23:07 +0200 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-07-08 13:23:07 +0200 |
| commit | 7d0e2b3fdd001b45741d97ee9c7833a69d6fb5ef (patch) | |
| tree | dc88ef36e04c083bc3c34255092677af1a81ce55 /config | |
| parent | a6a12b241fbacd3ff35cd901190e62d14aaac3c2 (diff) | |
| parent | 6335b32aa8f5c54cf5f09638189a77cad5785077 (diff) | |
| download | pleroma-7d0e2b3fdd001b45741d97ee9c7833a69d6fb5ef.tar.gz pleroma-7d0e2b3fdd001b45741d97ee9c7833a69d6fb5ef.zip | |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into follow-pipeline
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 5 | ||||
| -rw-r--r-- | config/description.exs | 6 |
2 files changed, 7 insertions, 4 deletions
diff --git a/config/config.exs b/config/config.exs index 9b550920c..458d3a99a 100644 --- a/config/config.exs +++ b/config/config.exs @@ -97,6 +97,7 @@ config :pleroma, :uri_schemes, "dat", "dweb", "gopher", + "hyper", "ipfs", "ipns", "irc", @@ -188,6 +189,7 @@ config :pleroma, :instance, background_image: "/images/city.jpg", instance_thumbnail: "/instance/thumbnail.jpeg", limit: 5_000, + description_limit: 5_000, chat_limit: 5_000, remote_limit: 100_000, upload_limit: 16_000_000, @@ -436,8 +438,7 @@ config :pleroma, Pleroma.Web.Metadata, config :pleroma, Pleroma.Web.Preload, providers: [ - Pleroma.Web.Preload.Providers.Instance, - Pleroma.Web.Preload.Providers.StatusNet + Pleroma.Web.Preload.Providers.Instance ] config :pleroma, :http_security, diff --git a/config/description.exs b/config/description.exs index 370af80a6..705ba83d0 100644 --- a/config/description.exs +++ b/config/description.exs @@ -498,6 +498,7 @@ config :pleroma, :config_description, [ "dat", "dweb", "gopher", + "hyper", "ipfs", "ipns", "irc", @@ -699,8 +700,9 @@ config :pleroma, :config_description, [ key: :public, type: :boolean, description: - "Makes the client API in authentificated mode-only except for user-profiles." <> - " Useful for disabling the Local Timeline and The Whole Known Network." + "Makes the client API in authenticated mode-only except for user-profiles." <> + " Useful for disabling the Local Timeline and The Whole Known Network. " <> + " Note: when setting to `false`, please also check `:restrict_unauthenticated` setting." }, %{ key: :quarantined_instances, |