diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2019-08-31 14:25:43 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2019-08-31 14:25:43 +0300 |
| commit | e890ea7e821d61fca75084d46f70ed125acf1fc8 (patch) | |
| tree | 7994c0be9f90b39a9ed46bbfd9f04fce70a14671 /installation | |
| parent | cd78e63a2528ab813088d5e44a026f6bb05b344b (diff) | |
| parent | 6d33c89c4d27a1b52e69e1c14b408726410a6326 (diff) | |
| download | pleroma-e890ea7e821d61fca75084d46f70ed125acf1fc8.tar.gz | |
[#1149] Added Oban job for "activity_expiration". Merged remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
# Conflicts:
# config/config.exs
Diffstat (limited to 'installation')
| -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; } } |