projects
/
akkoma
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
2b553b8
)
Most proxy settings can be global
author
Mark Felder
<feld@FreeBSD.org>
Mon, 21 Sep 2020 21:13:45 +0000
(16:13 -0500)
committer
Mark Felder
<feld@FreeBSD.org>
Mon, 21 Sep 2020 21:13:45 +0000
(16:13 -0500)
installation/pleroma.nginx
patch
|
blob
|
history
diff --git
a/installation/pleroma.nginx
b/installation/pleroma.nginx
index ce74f46e18671e33d138c5edb239a0ede9628c93..5517e3fc39ea3a74874d6cf722d440c145dd7866 100644
(file)
--- a/
installation/pleroma.nginx
+++ b/
installation/pleroma.nginx
@@
-65,13
+65,13
@@
server {
client_max_body_size 16m;
ignore_invalid_headers off;
client_max_body_size 16m;
ignore_invalid_headers off;
- location / {
- proxy_http_version 1.1;
- proxy_set_header Upgrade $http_upgrade;
- proxy_set_header Connection "upgrade";
- proxy_set_header Host $http_host;
- proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+ proxy_http_version 1.1;
+ proxy_set_header Upgrade $http_upgrade;
+ proxy_set_header Connection "upgrade";
+ proxy_set_header Host $http_host;
+ proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+ location / {
# 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;
# 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;
@@
-82,7
+82,6
@@
server {
slice 1m;
proxy_cache_key $host$uri$is_args$args$slice_range;
proxy_set_header Range $slice_range;
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_ignore_client_abort on;
proxy_cache_valid 200 206 301 304 1h;
proxy_cache_lock on;
proxy_ignore_client_abort on;
@@
-92,14
+91,6
@@
server {
}
location /api/fedsocket/v1 {
}
location /api/fedsocket/v1 {
- proxy_http_version 1.1;
- proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
- proxy_set_header X-Real-IP $remote_addr;
- proxy_set_header Host $host;
-
- # The Important Websocket Bits!
- proxy_set_header Upgrade $http_upgrade;
- proxy_set_header Connection "Upgrade";
proxy_request_buffering off;
proxy_pass http://127.0.0.1:4000/api/fedsocket/v1;
}
proxy_request_buffering off;
proxy_pass http://127.0.0.1:4000/api/fedsocket/v1;
}