diff options
| author | Haelwenn (lanodan) Monnier <contact@hacktivis.me> | 2020-07-08 05:56:24 +0200 |
|---|---|---|
| committer | Haelwenn (lanodan) Monnier <contact@hacktivis.me> | 2020-07-08 06:28:40 +0200 |
| commit | 312fc55f14e1b7f88ec43b72c577bf5df595beac (patch) | |
| tree | 78dcafbc755dfabea5fd201f5e46a887c0db0b7e /config | |
| parent | 8c9df2d2e6a5a3639f6b411cd3e9b57248a0650c (diff) | |
| download | pleroma-312fc55f14e1b7f88ec43b72c577bf5df595beac.tar.gz pleroma-312fc55f14e1b7f88ec43b72c577bf5df595beac.zip | |
Add [:instances_favicons, :enabled] setting, defaults to false
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 2 | ||||
| -rw-r--r-- | config/description.exs | 13 | ||||
| -rw-r--r-- | config/test.exs | 2 |
3 files changed, 17 insertions, 0 deletions
diff --git a/config/config.exs b/config/config.exs index 458d3a99a..3577cd101 100644 --- a/config/config.exs +++ b/config/config.exs @@ -706,6 +706,8 @@ config :tzdata, :http_client, Pleroma.HTTP.Tzdata config :ex_aws, http_client: Pleroma.HTTP.ExAws +config :pleroma, :instances_favicons, enabled: false + # 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" diff --git a/config/description.exs b/config/description.exs index 650610fbe..7c432d67d 100644 --- a/config/description.exs +++ b/config/description.exs @@ -3447,5 +3447,18 @@ config :pleroma, :config_description, [ suggestions: [false] } ] + }, + %{ + group: :pleroma, + key: :instances_favicons, + type: :group, + description: "Control favicons for instances", + children: [ + %{ + key: :enabled, + type: :boolean, + description: "Allow/disallow displaying and getting instances favicons" + } + ] } ] diff --git a/config/test.exs b/config/test.exs index e38b9967d..e6596e0bc 100644 --- a/config/test.exs +++ b/config/test.exs @@ -111,6 +111,8 @@ config :pleroma, Pleroma.Plugs.RemoteIp, enabled: false config :pleroma, Pleroma.Web.ApiSpec.CastAndValidate, strict: true +config :pleroma, :instances_favicons, enabled: true + if File.exists?("./config/test.secret.exs") do import_config "test.secret.exs" else |