From b263fb2ffdf77a91aa705d8e4cb6ff558206ba84 Mon Sep 17 00:00:00 2001 From: David Date: Sat, 17 Jun 2023 15:17:34 +0200 Subject: [PATCH 1/4] feat(adminmanual): Updated collabora online docker server installation instructions regarding escaping of dots Signed-off-by: David --- admin_manual/office/example-docker.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/admin_manual/office/example-docker.rst b/admin_manual/office/example-docker.rst index 53a3fef4a..cfe45f62b 100644 --- a/admin_manual/office/example-docker.rst +++ b/admin_manual/office/example-docker.rst @@ -17,13 +17,13 @@ To install it the following dependencies are required: Install the Collabora Online server ************************************** -The following steps will download the Collabora Online docker. Make sure to replace "cloud.example.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` instead. (All hosts are separated by `\|`.) +The following steps will download the Collabora Online docker. Make sure to replace "cloud.example.com" with the host that your own Nextcloud runs on. Also make sure to escape all dots with backslashes (`\`), since this string will be evaluated as a regular expression. (With earlier versions of the docker image dots needed to be escaped with two backslashes. This is no longer necessary for 21.11.3.6 and later versions of the docker image.) 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` instead. (All hosts are separated by `\|`.) .. code-block:: bash docker pull collabora/code docker run -t -d -p 127.0.0.1:9980:9980 \ - -e 'domain=cloud\\.example\\.com' \ + -e 'domain=cloud\.example\.com' \ --restart always \ --cap-add MKNOD \ collabora/code From 5374b7657f606cfbc50f8a9136f0c843d17cc094 Mon Sep 17 00:00:00 2001 From: David Date: Sat, 17 Jun 2023 15:20:30 +0200 Subject: [PATCH 2/4] fix(adminmanual): Display backslash correctly Signed-off-by: David --- admin_manual/office/example-docker.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin_manual/office/example-docker.rst b/admin_manual/office/example-docker.rst index cfe45f62b..e98091d96 100644 --- a/admin_manual/office/example-docker.rst +++ b/admin_manual/office/example-docker.rst @@ -17,7 +17,7 @@ To install it the following dependencies are required: Install the Collabora Online server ************************************** -The following steps will download the Collabora Online docker. Make sure to replace "cloud.example.com" with the host that your own Nextcloud runs on. Also make sure to escape all dots with backslashes (`\`), since this string will be evaluated as a regular expression. (With earlier versions of the docker image dots needed to be escaped with two backslashes. This is no longer necessary for 21.11.3.6 and later versions of the docker image.) 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` instead. (All hosts are separated by `\|`.) +The following steps will download the Collabora Online docker. Make sure to replace "cloud.example.com" with the host that your own Nextcloud runs on. Also make sure to escape all dots with backslashes (`\\`), since this string will be evaluated as a regular expression. (With earlier versions of the docker image dots needed to be escaped with two backslashes. This is no longer necessary for 21.11.3.6 and later versions of the docker image.) 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` instead. (All hosts are separated by `\|`.) .. code-block:: bash From 43561a58bea535de81a31d9e90582f2b225029ad Mon Sep 17 00:00:00 2001 From: David Date: Sun, 18 Jun 2023 00:07:06 +0200 Subject: [PATCH 3/4] feat(adminmanual): use aliasgroup1 environment variable with collabora/code image as recommended Co-authored-by: Simon L. Signed-off-by: David --- admin_manual/office/example-docker.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin_manual/office/example-docker.rst b/admin_manual/office/example-docker.rst index e98091d96..ae6ebd0f6 100644 --- a/admin_manual/office/example-docker.rst +++ b/admin_manual/office/example-docker.rst @@ -23,7 +23,7 @@ The following steps will download the Collabora Online docker. Make sure to repl docker pull collabora/code docker run -t -d -p 127.0.0.1:9980:9980 \ - -e 'domain=cloud\.example\.com' \ + -e 'aliasgroup1=https://cloud.example.com:443' \ --restart always \ --cap-add MKNOD \ collabora/code From 47ef985e99161724d035df0e02ef1cdd4740aac9 Mon Sep 17 00:00:00 2001 From: David Date: Fri, 23 Jun 2023 17:31:22 +0200 Subject: [PATCH 4/4] feat(adminmanual): remove outdated instructions regarding escaping and better explain aliasgroup Co-authored-by: Simon L. Signed-off-by: David --- admin_manual/office/example-docker.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin_manual/office/example-docker.rst b/admin_manual/office/example-docker.rst index ae6ebd0f6..e110e0bc4 100644 --- a/admin_manual/office/example-docker.rst +++ b/admin_manual/office/example-docker.rst @@ -17,7 +17,7 @@ To install it the following dependencies are required: Install the Collabora Online server ************************************** -The following steps will download the Collabora Online docker. Make sure to replace "cloud.example.com" with the host that your own Nextcloud runs on. Also make sure to escape all dots with backslashes (`\\`), since this string will be evaluated as a regular expression. (With earlier versions of the docker image dots needed to be escaped with two backslashes. This is no longer necessary for 21.11.3.6 and later versions of the docker image.) 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` instead. (All hosts are separated by `\|`.) +The following steps will download the Collabora Online docker. Make sure to replace "cloud.example.com" with the host that your own Nextcloud runs on. If you want to use the docker container with more than one Nextcloud, you can add another `-e aliasgroup2=https://cloud2.example.com:443`. .. code-block:: bash