diff options
| author | Egor Kislitsyn <egor@kislitsyn.com> | 2018-12-06 20:15:16 +0700 |
|---|---|---|
| committer | Egor Kislitsyn <egor@kislitsyn.com> | 2018-12-06 20:15:16 +0700 |
| commit | 4944498133d4a945650201226808b1f09d355014 (patch) | |
| tree | 02e83bac731ca6b391b63d826d8230bdb0fdaed8 /installation | |
| parent | bac58b152495c3ebf72e3ad1c3102de075fcc366 (diff) | |
| parent | ccf0b46dd6a0390a06847b4a1c3eedc8d8e6c916 (diff) | |
| download | pleroma-4944498133d4a945650201226808b1f09d355014.tar.gz pleroma-4944498133d4a945650201226808b1f09d355014.zip | |
Merge branch 'develop' into feature/compat/push-subscriptions
# Conflicts:
# lib/pleroma/application.ex
# lib/pleroma/plugs/oauth_plug.ex
Diffstat (limited to 'installation')
| -rw-r--r-- | installation/pleroma.nginx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/installation/pleroma.nginx b/installation/pleroma.nginx index f0e684f2c..e1184fe77 100644 --- a/installation/pleroma.nginx +++ b/installation/pleroma.nginx @@ -70,10 +70,12 @@ server { client_max_body_size 16m; } - location /proxy { + location ~ ^/(media|proxy) { proxy_cache pleroma_media_cache; proxy_cache_lock on; proxy_ignore_client_abort on; + proxy_buffering off; + chunked_transfer_encoding on; proxy_pass http://localhost:4000; } } |