summaryrefslogtreecommitdiff
path: root/installation
diff options
context:
space:
mode:
authorMaksim Pechnikov <parallel588@gmail.com>2019-09-06 14:01:07 +0300
committerMaksim Pechnikov <parallel588@gmail.com>2019-09-06 14:01:07 +0300
commiteb74c3d5c7a4bebbee43e123661d87e7605a32ba (patch)
tree5a034ddf84ce2fb0bb72501b146df967299c3685 /installation
parent6ef0103ca0b194971a2e6f61685316536b742a11 (diff)
parent896ffabe37406e85c2a3c2f30d2e882c68b5831e (diff)
downloadpleroma-eb74c3d5c7a4bebbee43e123661d87e7605a32ba.tar.gz
pleroma-eb74c3d5c7a4bebbee43e123661d87e7605a32ba.zip
Merge branch 'develop' into issue/1218
Diffstat (limited to 'installation')
-rw-r--r--installation/pleroma.nginx14
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;
}
}