fix Collabora init container and Nginx config for newer Collabora version

also fix wrong path for sources-push volume

doc/docker/docker-compose.yml

@@ -12,7 +12,7 @@ volumes:
     driver_opts:
       type: none
       o: bind
-      device: $PWD/sources/egroupware/swoolepush
+      device: $PWD/sources/swoolepush
   db:
   data:
     driver_opts:
@@ -187,12 +187,8 @@ services:
   collabora-key:
     image: "quay.io/egroupware/collabora-key:stable"
     #image: collabora/code:latest
-    # needs to be initialised via: docker run --rm -v dev_collabora-config:/mnt --entrypoint '/bin/cp -r /etc/loolwsd /mnt' quay.io/egroupware/collabora-key:stable
     volumes:
-      - collabora-config:/etc/loolwsd
-    # dont try to regenerate the (not used certificate) as volumn is readonly
-    environment:
-      - DONT_GEN_SSL_CERT=1
+      - collabora-config:/etc/coolwsd
     restart: always
     container_name: collabora-key
     # set the ip-address of your docker host AND your official DNS name so Collabora
@@ -205,7 +201,7 @@ services:
   # initialise the collabora-config volume
   collabora-init:
     image: "quay.io/egroupware/collabora-key:latest"
-    command:  bash -c "test -f /tmp/coolwsd/coolwsd.xml || (cp -p /etc/coolwsd/* /tmp/coolwsd && cd /tmp/coolwsd && ln -s coolwsd.conf loolwsd.conf)"
+    command:  bash -c 'test -f /tmp/coolwsd/coolwsd.xml || (cp -p /etc/coolwsd/* /tmp/coolwsd/; sed "s/<enable type=\"bool\" desc=\"Controls whether SSL encryption between coolwsd and the network is enabled (do not disable for production deployment). If default is false, must first be compiled with SSL support to enable.\" default=\"true\">true</<enable type=\"bool\" desc=\"Controls whether SSL encryption between coolwsd and the network is enabled (do not disable for production deployment). If default is false, must first be compiled with SSL support to enable.\" default=\"true\">false</g" < /etc/coolwsd/coolwsd.xml > /tmp/coolwsd/coolwsd.xml)'
     volumes:
       - collabora-config:/tmp/coolwsd
 
@@ -265,4 +261,4 @@ services:
 #    volumes:
 #      - /var/run/docker.sock:/var/run/docker.sock
 #      - portainer_data:/data
-#    container_name: portainer
+#    container_name: portainer

doc/docker/nginx.conf

@@ -149,7 +149,7 @@ server {
 
 	# Collabora sniplet meant to be included in server block of EGroupware vhost
 	# static files
-	location ^~ /loleaflet {
+	location ^~ /browser {
 		proxy_pass http://collabora-key:9980;
 		proxy_set_header Host $http_host;
 	}
@@ -160,8 +160,14 @@ server {
 		proxy_set_header Host $http_host;
 	}
 
-	# websockets, download, presentation and image upload
-	location ^~ /lool {
+    # Capabilities
+    location ^~ /hosting/capabilities {
+      proxy_pass http://collabora-key:9980;
+      proxy_set_header Host $http_host;
+    }
+
+    # websockets, download, presentation and image upload
+	location ^~ /cool {
 		proxy_pass http://collabora-key:9980;
 		proxy_set_header Upgrade $http_upgrade;
 		proxy_set_header Connection "upgrade";