diff options
| author | feld <feld@feld.me> | 2019-08-30 15:23:15 +0000 |
|---|---|---|
| committer | feld <feld@feld.me> | 2019-08-30 15:23:15 +0000 |
| commit | 6d33c89c4d27a1b52e69e1c14b408726410a6326 (patch) | |
| tree | 0f966c482a66bbd31224b60b033845e0c7bf9acc | |
| parent | a7202b52e0e39b14a9fe521b689208655df4aea8 (diff) | |
| parent | 99b4847da3244a0d023ae25b2669afb07a4eda4f (diff) | |
| download | pleroma-6d33c89c4d27a1b52e69e1c14b408726410a6326.tar.gz | |
Merge branch 'iss-930-media' into 'develop'
Fix missing changes in pleroma/pleroma!1197
See merge request pleroma/pleroma!1613
| -rw-r--r-- | installation/pleroma.nginx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/installation/pleroma.nginx b/installation/pleroma.nginx index e3c70de54..4da9918ca 100644 --- a/installation/pleroma.nginx +++ b/installation/pleroma.nginx @@ -71,26 +71,26 @@ server { proxy_set_header Connection "upgrade"; proxy_set_header Host $http_host; - # this is explicitly IPv4 since Pleroma.Web.Endpoint binds on IPv4 only - # and `localhost.` resolves to [::0] on some systems: see issue #930 + # this is explicitly IPv4 since Pleroma.Web.Endpoint binds on IPv4 only + # and `localhost.` resolves to [::0] on some systems: see issue #930 proxy_pass http://127.0.0.1:4000; client_max_body_size 16m; } location ~ ^/(media|proxy) { - proxy_cache pleroma_media_cache; + proxy_cache pleroma_media_cache; slice 1m; proxy_cache_key $host$uri$is_args$args$slice_range; proxy_set_header Range $slice_range; proxy_http_version 1.1; proxy_cache_valid 200 206 301 304 1h; - proxy_cache_lock on; + proxy_cache_lock on; proxy_ignore_client_abort on; - proxy_buffering on; + proxy_buffering on; chunked_transfer_encoding on; proxy_ignore_headers Cache-Control; - proxy_hide_header Cache-Control; - proxy_pass http://localhost:4000; + proxy_hide_header Cache-Control; + proxy_pass http://127.0.0.1:4000; } } |