From 21d70e575a2fec0fc6acc72ad42943b1891e54e8 Mon Sep 17 00:00:00 2001
From: cellarspoon <cellarspoon@riseup.net>
Date: Wed, 15 Dec 2021 09:38:42 +0100
Subject: [PATCH] fix: new coolwsd config

---
 nginx.conf.tmpl | 84 ++++++++++++++++++++++++++-----------------------
 1 file changed, 44 insertions(+), 40 deletions(-)

diff --git a/nginx.conf.tmpl b/nginx.conf.tmpl
index 0a5d3f5..29adf55 100644
--- a/nginx.conf.tmpl
+++ b/nginx.conf.tmpl
@@ -6,54 +6,58 @@ events {
 
 http {
     upstream collabora-upstream {
-        server {{ env "STACK_NAME" }}_app:9980;
+      server {{ env "STACK_NAME" }}_app:9980;
     }
 
     server {
-        listen 80;
-        server_name {{ env "DOMAIN" }};
+      listen 80;
+      server_name {{ env "DOMAIN" }};
 
-        # static files
-        location ^~ /loleaflet {
-            proxy_pass http://collabora-upstream;
-            proxy_set_header Host $http_host;
-        }
+      # static files
+      location ^~ /browser {
+        proxy_pass http://collabora-upstream;
+        proxy_set_header Host $http_host;
+      }
 
-        # WOPI discovery URL
-        location ^~ /hosting/discovery {
-            proxy_pass http://collabora-upstream;
-            proxy_set_header Host $http_host;
-        }
 
-        # Capabilities
-        location ^~ /hosting/capabilities {
-            proxy_pass http://collabora-upstream;
-            proxy_set_header Host $http_host;
-        }
+      # WOPI discovery URL
+      location ^~ /hosting/discovery {
+        proxy_pass http://collabora-upstream;
+        proxy_set_header Host $http_host;
+      }
 
-        # Main websocket
-        location ~ /lool/(.*)/ws$ {
-            proxy_pass http://collabora-upstream;
-            proxy_set_header Upgrade $http_upgrade;
-            proxy_set_header Connection "Upgrade";
-            proxy_set_header Host $http_host;
-            proxy_read_timeout 36000s;
-        }
 
-        # Admin Console websocket
-        location ^~ /lool/adminws {
-        proxy_buffering off;
-            proxy_pass http://collabora-upstream;
-            proxy_set_header Upgrade $http_upgrade;
-            proxy_set_header Connection "Upgrade";
-            proxy_set_header Host $http_host;
-            proxy_read_timeout 36000s;
-        }
+      # Capabilities
+      location ^~ /hosting/capabilities {
+        proxy_pass http://collabora-upstream;
+        proxy_set_header Host $http_host;
+      }
 
-        # download, presentation and image upload
-        location ~ /lool {
-            proxy_pass http://collabora-upstream;
-            proxy_set_header Host $http_host;
-        }
+
+      # main websocket
+      location ~ ^/cool/(.*)/ws$ {
+        proxy_pass http://collabora-upstream;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection "Upgrade";
+        proxy_set_header Host $http_host;
+        proxy_read_timeout 36000s;
+      }
+
+
+      # download, presentation and image upload
+      location ~ ^/(c|l)ool {
+        proxy_pass http://collabora-upstream;
+        proxy_set_header Host $http_host;
+      }
+
+
+       # Admin Console websocket
+       location ^~ /cool/adminws {
+        proxy_pass http://collabora-upstream;
+         proxy_set_header Upgrade $http_upgrade;
+         proxy_set_header Connection "Upgrade";
+         proxy_set_header Host $http_host;
+         proxy_read_timeout 36000s;
+       }
     }
 }