From 5d59e8f34a92224214e228f4faad3bbf3c95b124 Mon Sep 17 00:00:00 2001 From: decentral1se Date: Tue, 27 Apr 2021 13:12:45 +0200 Subject: [PATCH] Revert "Don't use upstream" This reverts commit e73911b1e451e734915277abf168d30a5dfe2dc5. --- nginx.conf.tmpl | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/nginx.conf.tmpl b/nginx.conf.tmpl index 8498935..545a17a 100644 --- a/nginx.conf.tmpl +++ b/nginx.conf.tmpl @@ -1,22 +1,26 @@ +upstream collabora-upstream { + server app:9980; +} + server { listen 80; server_name {{ env "DOMAIN" }}; # static files location ^~ /loleaflet { - proxy_pass http://app:9980; + proxy_pass http://collabora-upstream; proxy_set_header Host $http_host; } # WOPI discovery URL location ^~ /hosting/discovery { - proxy_pass http://app:9980; + proxy_pass http://collabora-upstream; proxy_set_header Host $http_host; } # Main websocket location ~ /lool/(.*)/ws$ { - proxy_pass http://app:9980; + proxy_pass http://collabora-upstream; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "Upgrade"; proxy_set_header Host $http_host; @@ -26,7 +30,7 @@ server { # Admin Console websocket location ^~ /lool/adminws { proxy_buffering off; - proxy_pass http://app:9980; + proxy_pass http://collabora-upstream; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "Upgrade"; proxy_set_header Host $http_host; @@ -35,7 +39,7 @@ server { # download, presentation and image upload location ~ /lool { - proxy_pass https://app:9980; + proxy_pass https://collabora-upstream; proxy_set_header Host $http_host; } }