Revert "Don't use upstream"

This reverts commit e73911b1e4.
This commit is contained in:
decentral1se 2021-04-27 13:12:45 +02:00
parent e73911b1e4
commit 5d59e8f34a
No known key found for this signature in database
GPG Key ID: 92DAD76BD9567B8A
1 changed files with 9 additions and 5 deletions

View File

@ -1,22 +1,26 @@
upstream collabora-upstream {
server app:9980;
}
server { server {
listen 80; listen 80;
server_name {{ env "DOMAIN" }}; server_name {{ env "DOMAIN" }};
# static files # static files
location ^~ /loleaflet { location ^~ /loleaflet {
proxy_pass http://app:9980; proxy_pass http://collabora-upstream;
proxy_set_header Host $http_host; proxy_set_header Host $http_host;
} }
# WOPI discovery URL # WOPI discovery URL
location ^~ /hosting/discovery { location ^~ /hosting/discovery {
proxy_pass http://app:9980; proxy_pass http://collabora-upstream;
proxy_set_header Host $http_host; proxy_set_header Host $http_host;
} }
# Main websocket # Main websocket
location ~ /lool/(.*)/ws$ { location ~ /lool/(.*)/ws$ {
proxy_pass http://app:9980; proxy_pass http://collabora-upstream;
proxy_set_header Upgrade $http_upgrade; proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "Upgrade"; proxy_set_header Connection "Upgrade";
proxy_set_header Host $http_host; proxy_set_header Host $http_host;
@ -26,7 +30,7 @@ server {
# Admin Console websocket # Admin Console websocket
location ^~ /lool/adminws { location ^~ /lool/adminws {
proxy_buffering off; proxy_buffering off;
proxy_pass http://app:9980; proxy_pass http://collabora-upstream;
proxy_set_header Upgrade $http_upgrade; proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "Upgrade"; proxy_set_header Connection "Upgrade";
proxy_set_header Host $http_host; proxy_set_header Host $http_host;
@ -35,7 +39,7 @@ server {
# download, presentation and image upload # download, presentation and image upload
location ~ /lool { location ~ /lool {
proxy_pass https://app:9980; proxy_pass https://collabora-upstream;
proxy_set_header Host $http_host; proxy_set_header Host $http_host;
} }
} }