sk-cloudio: upgrade kubernetes and collabora

1 files changed, 16 insertions, 0 deletions

diff --git a/roles/apps/collabora/code/templates/nginx-vhost.conf.j2 b/roles/apps/collabora/code/templates/nginx-vhost.conf.j2
index a14113f0..d56d77a0 100644
--- a/roles/apps/collabora/code/templates/nginx-vhost.conf.j2
+++ b/roles/apps/collabora/code/templates/nginx-vhost.conf.j2
@@ -25,7 +25,11 @@ server {
     client_max_body_size 128M;
 
     # static files
+{% if item.value.version | collabora_code_loolvcool %}
     location ^~ /loleaflet {
+{% else %}
+    location ^~ /browser {
+{% endif %}
         include snippets/proxy-nobuff.conf;
         include snippets/proxy-forward-headers.conf;
 
@@ -61,7 +65,11 @@ server {
     }
 
     # main websocket
+{% if item.value.version | collabora_code_loolvcool %}
     location ~ ^/lool/(.*)/ws$ {
+{% else %}
+    location ~ ^/cool/(.*)/ws$ {
+{% endif %}
         include snippets/proxy-nobuff.conf;
         include snippets/proxy-forward-headers.conf;
 
@@ -78,7 +86,11 @@ server {
     }
 
     # download, presentation and image upload
+{% if item.value.version | collabora_code_loolvcool %}
     location ~ ^/lool {
+{% else %}
+    location ~ ^/(c|l)ool {
+{% endif %}
         include snippets/proxy-nobuff.conf;
         include snippets/proxy-forward-headers.conf;
 
@@ -90,7 +102,11 @@ server {
     }
 
     # Admin Console websocket
+{% if item.value.version | collabora_code_loolvcool %}
     location ^~ /lool/adminws {
+{% else %}
+    location ^~ /cool/adminws {
+{% endif %}
         include snippets/proxy-nobuff.conf;
         include snippets/proxy-forward-headers.conf;