diff options
Diffstat (limited to 'config')
-rw-r--r-- | config/config.exs | 8 | ||||
-rw-r--r-- | config/description.exs | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/config/config.exs b/config/config.exs index bd559c835..9b550920c 100644 --- a/config/config.exs +++ b/config/config.exs @@ -434,6 +434,12 @@ config :pleroma, Pleroma.Web.Metadata, ], unfurl_nsfw: false +config :pleroma, Pleroma.Web.Preload, + providers: [ + Pleroma.Web.Preload.Providers.Instance, + Pleroma.Web.Preload.Providers.StatusNet + ] + config :pleroma, :http_security, enabled: true, sts: false, @@ -697,6 +703,8 @@ config :pleroma, :mrf, config :tzdata, :http_client, Pleroma.HTTP.Tzdata +config :ex_aws, http_client: Pleroma.HTTP.ExAws + # 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 b34961c49..4ea8a2f50 100644 --- a/config/description.exs +++ b/config/description.exs @@ -957,7 +957,7 @@ config :pleroma, :config_description, [ key: :instance_thumbnail, type: :string, description: - "The instance thumbnail image. It will appear in [Pleroma Instances](http://distsn.org/pleroma-instances.html)", + "The instance thumbnail can be any image that represents your instance and is used by some apps or services when they display information about your instance.", suggestions: ["/instance/thumbnail.jpeg"] } ] |