Combine nginx federation server blocks (#7823)

I'm pretty sure there's no technical reason these have to be distinct server blocks, so collapse into one and go with the more terse location block.

Signed-off-by: Luke W Faraone <luke@faraone.cc>
This commit is contained in:
Luke Faraone 2020-07-16 15:01:45 +00:00 committed by GitHub
parent e5300063ed
commit b0f031f92a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 11 deletions

View File

@ -38,6 +38,11 @@ the reverse proxy and the homeserver.
server { server {
listen 443 ssl; listen 443 ssl;
listen [::]:443 ssl; listen [::]:443 ssl;
# For the federation port
listen 8448 ssl default_server;
listen [::]:8448 ssl default_server;
server_name matrix.example.com; server_name matrix.example.com;
location /_matrix { location /_matrix {
@ -48,17 +53,6 @@ server {
client_max_body_size 10M; client_max_body_size 10M;
} }
} }
server {
listen 8448 ssl default_server;
listen [::]:8448 ssl default_server;
server_name example.com;
location / {
proxy_pass http://localhost:8008;
proxy_set_header X-Forwarded-For $remote_addr;
}
}
``` ```
**NOTE**: Do not add a path after the port in `proxy_pass`, otherwise nginx will **NOTE**: Do not add a path after the port in `proxy_pass`, otherwise nginx will