projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'StealEmojiMRF_add_adminFE' into 'develop'
[akkoma]
/
installation
/
pleroma.nginx
diff --git
a/installation/pleroma.nginx
b/installation/pleroma.nginx
index 5517e3fc39ea3a74874d6cf722d440c145dd7866..9890cb2b1965e5550dfa8b81610c26e55aebdcbe 100644
(file)
--- a/
installation/pleroma.nginx
+++ b/
installation/pleroma.nginx
@@
-9,6
+9,12
@@
proxy_cache_path /tmp/pleroma-media-cache levels=1:2 keys_zone=pleroma_media_cache:10m max_size=10g
inactive=720m use_temp_path=off;
proxy_cache_path /tmp/pleroma-media-cache levels=1:2 keys_zone=pleroma_media_cache:10m max_size=10g
inactive=720m use_temp_path=off;
+# this is explicitly IPv4 since Pleroma.Web.Endpoint binds on IPv4 only
+# and `localhost.` resolves to [::0] on some systems: see issue #930
+upstream phoenix {
+ server 127.0.0.1:4000 max_fails=5 fail_timeout=60s;
+}
+
server {
server_name example.tld;
server {
server_name example.tld;
@@
-72,9
+78,7
@@
server {
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
location / {
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;
+ proxy_pass http://phoenix;
}
location ~ ^/(media|proxy) {
}
location ~ ^/(media|proxy) {
@@
-87,11
+91,6
@@
server {
proxy_ignore_client_abort on;
proxy_buffering on;
chunked_transfer_encoding on;
proxy_ignore_client_abort on;
proxy_buffering on;
chunked_transfer_encoding on;
- proxy_pass http://127.0.0.1:4000;
- }
-
- location /api/fedsocket/v1 {
- proxy_request_buffering off;
- proxy_pass http://127.0.0.1:4000/api/fedsocket/v1;
+ proxy_pass http://phoenix;
}
}
}
}