diff options
| author | kaniini <nenolod@gmail.com> | 2018-10-29 18:07:47 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2018-10-29 18:07:47 +0000 |
| commit | 7ac701ccd211d0a1b04243e4c0591adb9f1996fc (patch) | |
| tree | 4785078ba8a5a7b6826508d03aaf620d792fe46b /config/config.exs | |
| parent | f61acdc5b41a8d05401c5d24d589f35ba1b573de (diff) | |
| parent | 36825932eb04d9db3e2d24b02368d7dd709dea23 (diff) | |
| download | pleroma-7ac701ccd211d0a1b04243e4c0591adb9f1996fc.tar.gz pleroma-7ac701ccd211d0a1b04243e4c0591adb9f1996fc.zip | |
Merge branch 'feature/s3-force-media-proxy' into 'develop'
s3 uploader: force public URIs through media proxy
See merge request pleroma/pleroma!403
Diffstat (limited to 'config/config.exs')
| -rw-r--r-- | config/config.exs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/config/config.exs b/config/config.exs index 2d2cdda45..a71fedf1c 100644 --- a/config/config.exs +++ b/config/config.exs @@ -20,7 +20,8 @@ config :pleroma, Pleroma.Uploaders.Local, config :pleroma, Pleroma.Uploaders.S3, bucket: nil, - public_endpoint: "https://s3.amazonaws.com" + public_endpoint: "https://s3.amazonaws.com", + force_media_proxy: false config :pleroma, :emoji, shortcode_globs: ["/emoji/custom/**/*.png"] |