From 26f20e63fdda1ba6c50f54bb0956eacc923dc49a Mon Sep 17 00:00:00 2001 From: Samuel Date: Thu, 28 Apr 2022 08:33:31 +0200 Subject: [PATCH 1/3] Adjusted loolswd and lool Replaced lool with cool and loleaflet with browser. According to: https://forum.collaboraonline.com/t/upgrade-from-loolwsd-to-coolwsd-broke-nextcloud-use/742/3 --- page-collaboraonline.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/page-collaboraonline.php b/page-collaboraonline.php index 4823b8a94..e3b036ac5 100644 --- a/page-collaboraonline.php +++ b/page-collaboraonline.php @@ -271,24 +271,24 @@ # keep the host ProxyPreserveHost On -# static html, js, images, etc. served from loolwsd -# loleaflet is the client part of LibreOffice Online -ProxyPass /loleaflet https://127.0.0.1:9980/loleaflet retry=0 -ProxyPassReverse /loleaflet https://127.0.0.1:9980/loleaflet +# static html, js, images, etc. served from coolwsd +# browser is the client part of LibreOffice Online +ProxyPass /browser https://127.0.0.1:9980/browser retry=0 +ProxyPassReverse /browser https://127.0.0.1:9980/browser # WOPI discovery URL ProxyPass /hosting/discovery https://127.0.0.1:9980/hosting/discovery retry=0 ProxyPassReverse /hosting/discovery https://127.0.0.1:9980/hosting/discovery # Main websocket -ProxyPassMatch "/lool/(.*)/ws$" wss://127.0.0.1:9980/lool/$1/ws nocanon +ProxyPassMatch "/cool/(.*)/ws$" wss://127.0.0.1:9980/cool/$1/ws nocanon # Admin Console websocket -ProxyPass /lool/adminws wss://127.0.0.1:9980/lool/adminws +ProxyPass /cool/adminws wss://127.0.0.1:9980/cool/adminws # Download as, Fullscreen presentation and Image upload operations -ProxyPass /lool https://127.0.0.1:9980/lool -ProxyPassReverse /lool https://127.0.0.1:9980/lool +ProxyPass /cool https://127.0.0.1:9980/cool +ProxyPassReverse /cool https://127.0.0.1:9980/cool # Endpoint with information about availability of various features ProxyPass /hosting/capabilities https://127.0.0.1:9980/hosting/capabilities retry=0 From d80b99d15d6bdc5b3ef5f85fce309ac251f37716 Mon Sep 17 00:00:00 2001 From: Samuel Date: Thu, 28 Apr 2022 08:38:53 +0200 Subject: [PATCH 2/3] parameter domain not valid anymore replaced by aliasgroup1 ref: https://sdk.collaboraonline.com/docs/installation/CODE_Docker_image.html https://github.com/CollaboraOnline/online/issues/4659#issuecomment-1111643356 --- page-collaboraonline.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/page-collaboraonline.php b/page-collaboraonline.php index e3b036ac5..5755b46f1 100644 --- a/page-collaboraonline.php +++ b/page-collaboraonline.php @@ -226,11 +226,11 @@

t('The following steps will download the Collabora Online docker, make sure to replace "cloud.nextcloud.com" with the host that your own Nextcloud runs on. Also make sure to escape all dots with double backslashes (\\), since this string will be evaluated as a regular expression (and your bash \'eats\' the first backslash.) If you want to use the docker container with more than one Nextcloud, you\'ll need to use');?> 'domain=cloud\\.nextcloud\\.com\|second\\.nextcloud\\.com' t('instead. (All hosts are separated by \|.)');?>


                 docker pull collabora/code
-                docker run -t -d -p 127.0.0.1:9980:9980 -e 'domain=cloud\\.nextcloud\\.com' --restart always --cap-add MKNOD collabora/code
+                docker run -t -d -p 127.0.0.1:9980:9980 -e 'aliasgroup1=https://cloud.nextcloud.com:443' --restart always --cap-add MKNOD collabora/code

t('Optionally, you can select the dictionaries you want with:');?>


-                docker run -t -d -p 127.0.0.1:9980:9980 -e 'domain=cloud\\.nextcloud\\.com' -e 'dictionaries=de en es ..' --restart always --cap-add MKNOD collabora/code
+                docker run -t -d -p 127.0.0.1:9980:9980 -e 'aliasgroup1=https://cloud.nextcloud.com:443' -e 'dictionaries=de en es ..' --restart always --cap-add MKNOD collabora/code

t('This way you are not only limited to German, English, Italian, French and Spanish.');?>

t('That will be enough. Once you have done that the server will listen on "localhost:9980". Now we just need to configure the locally installed Apache reverse proxy.');?>

@@ -326,7 +326,7 @@
  • t('start the new image:
    ');?> -docker run -t -d -p 127.0.0.1:9980:9980 -e 'domain=cloud\\.nextcloud\\.com' --restart always --cap-add MKNOD collabora/code +docker run -t -d -p 127.0.0.1:9980:9980 -e 'aliasgroup1=https://cloud.nextcloud.com:443' --restart always --cap-add MKNOD collabora/code

    • t('Enjoy!');?>

    From 4fcddf7b7cb55777672ae65f7c3f185c37a83545 Mon Sep 17 00:00:00 2001 From: Samuel Date: Tue, 3 May 2022 08:53:27 +0200 Subject: [PATCH 3/3] reflect Virtualhost in NC23 and changes to CODE --- page-collaboraonline.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/page-collaboraonline.php b/page-collaboraonline.php index 5755b46f1..1f8c6e091 100644 --- a/page-collaboraonline.php +++ b/page-collaboraonline.php @@ -223,7 +223,7 @@

    t('Note: This guide does NOT cover self-signed certificates. If you use a self-signed certificate then you\'re mostly on your own ;-)');?>

    t('1. Install the Collabora Online server');?>

    -

    t('The following steps will download the Collabora Online docker, make sure to replace "cloud.nextcloud.com" with the host that your own Nextcloud runs on. Also make sure to escape all dots with double backslashes (\\), since this string will be evaluated as a regular expression (and your bash \'eats\' the first backslash.) If you want to use the docker container with more than one Nextcloud, you\'ll need to use');?> 'domain=cloud\\.nextcloud\\.com\|second\\.nextcloud\\.com' t('instead. (All hosts are separated by \|.)');?>

    +

    t('The following steps will download the Collabora Online docker, make sure to replace "cloud.nextcloud.com" with the host that your own Nextcloud runs on. If you want to use the docker container with more than one Nextcloud, you\'ll need to use');?> '-e "aliasgroup1=https://:443,https://|:443" -e "aliasgroup2=https://:443"' t('instead.');?>

    
                 docker pull collabora/code
                 docker run -t -d -p 127.0.0.1:9980:9980 -e 'aliasgroup1=https://cloud.nextcloud.com:443' --restart always --cap-add MKNOD collabora/code
@@ -243,7 +243,6 @@
 				
  • a2enmod proxy_http
    • 
 				
  • a2enmod ssl
    • 
 			
-			
    t('Warning, if you are using Nextcloud 23 (Nextcloud HUB II), the VirtualHost configuration has changed. You can find the latest installation information on Collabora Online official documentation', ['https://sdk.collaboraonline.com/docs/installation/Proxy_settings.html#reverse-proxy-with-apache-2-webserver']);?>
    
 			
    t('Afterward, configure one VirtualHost properly to proxy the traffic. For security reason we recommend to use a subdomain such as office.nextcloud.com instead of running on the same domain. An example config can be found below:');?>
    
 			
     				
@@ -296,7 +295,7 @@
 </VirtualHost>
 			
    
 			
-			
    t('After configuring these do restart your apache using /etc/init.d/apache2 restart.');?>
    
+			
    t('After configuring these do restart your apache using systemctl restart apache2.service.');?>
    
 			
    t('3. Configure the app in Nextcloud');?>
    
 			
      
 				
    1. t('Go to the Apps section and choose "Office & text"');?>
      2.