diff options
| author | Alexander Strizhakov <alex.strizhakov@gmail.com> | 2020-07-11 10:36:36 +0300 |
|---|---|---|
| committer | Alexander Strizhakov <alex.strizhakov@gmail.com> | 2020-07-12 12:41:40 +0300 |
| commit | b3764423251c963a5ca007517189f556bfe95155 (patch) | |
| tree | d9f0c2aa9a7c69a267487e88298714a7bc5a442c /config | |
| parent | d6f67fa91b00b28d7be9f82bb300f9d650c73744 (diff) | |
| download | pleroma-b3764423251c963a5ca007517189f556bfe95155.tar.gz pleroma-b3764423251c963a5ca007517189f556bfe95155.zip | |
MediaProxy whitelist setting now supports hosts with scheme
added deprecation warning about using bare domains
Diffstat (limited to 'config')
| -rw-r--r-- | config/description.exs | 4 | ||||
| -rw-r--r-- | config/test.exs | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/config/description.exs b/config/description.exs index b0cc8d527..432705307 100644 --- a/config/description.exs +++ b/config/description.exs @@ -1775,8 +1775,8 @@ config :pleroma, :config_description, [ %{ key: :whitelist, type: {:list, :string}, - description: "List of domains to bypass the mediaproxy", - suggestions: ["example.com"] + description: "List of hosts with scheme to bypass the mediaproxy", + suggestions: ["http://example.com"] } ] }, diff --git a/config/test.exs b/config/test.exs index d45c36b7b..abcf793e5 100644 --- a/config/test.exs +++ b/config/test.exs @@ -113,6 +113,11 @@ config :pleroma, Pleroma.Web.ApiSpec.CastAndValidate, strict: true config :pleroma, :instances_favicons, enabled: true +config :pleroma, Pleroma.Uploaders.S3, + bucket: nil, + streaming_enabled: true, + public_endpoint: nil + if File.exists?("./config/test.secret.exs") do import_config "test.secret.exs" else |