summaryrefslogtreecommitdiff
path: root/installation
diff options
context:
space:
mode:
authorMaxim Filippov <colixer@gmail.com>2019-09-04 19:40:07 +0300
committerMaxim Filippov <colixer@gmail.com>2019-09-04 19:40:07 +0300
commit3542ca6702707ace070761c57350c10cd8c2a745 (patch)
tree9ad8d143eddf0ae9f4e8ebcb453f466fa1b8b9ed /installation
parent6c2fd1b78bbbb4486a5dddeffa053199ba8cc015 (diff)
parente72531bfacb2399ad0783a26b1c23f0bba24a107 (diff)
downloadpleroma-3542ca6702707ace070761c57350c10cd8c2a745.tar.gz
pleroma-3542ca6702707ace070761c57350c10cd8c2a745.zip
Merge branch 'develop' into feature/moderation-log-filters
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;
}
}