diff options
| author | feld <feld@feld.me> | 2020-07-14 18:07:44 +0000 |
|---|---|---|
| committer | feld <feld@feld.me> | 2020-07-14 18:07:44 +0000 |
| commit | 3f65f2ea79644cd8a119fc154c2792994723c7cb (patch) | |
| tree | 1f82bee15cc9f338c566413881e88108c16f8ff5 /config | |
| parent | 63798e89deb2079cc0828c8722489c907c13f93c (diff) | |
| parent | b3764423251c963a5ca007517189f556bfe95155 (diff) | |
| download | pleroma-3f65f2ea79644cd8a119fc154c2792994723c7cb.tar.gz pleroma-3f65f2ea79644cd8a119fc154c2792994723c7cb.zip | |
Merge branch 'feature/1922-media-proxy-whitelist' into 'develop'
Support for hosts with scheme in MediaProxy whitelist setting
Closes #1922
See merge request pleroma/pleroma!2754
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 2b41e7dac..afc4dcd79 100644 --- a/config/description.exs +++ b/config/description.exs @@ -1768,8 +1768,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 |