Added info about installing and connecting from nextcloud. And info about setting languages.

Reviewed-on: coop-cloud/collabora#7

.drone.yml

@@ -3,10 +3,12 @@ kind: pipeline
 name: deploy to swarm-test.autonomic.zone
 steps:
   - name: deployment
-    image: decentral1se/stack-ssh-deploy:latest
+    image: git.coopcloud.tech/coop-cloud/stack-ssh-deploy:latest
     settings:
       host: swarm-test.autonomic.zone
       stack: collabora
+      networks:
+       - proxy
       generate_secrets: true
       purge: true
       deploy_key:
@@ -16,17 +18,24 @@ steps:
       STACK_NAME: collabora
       LETS_ENCRYPT_ENV: production
       NGINX_CONF_VERSION: v1
-      LOOLWSD_XML_VERSION: v1
+      COOLWSD_XML_VERSION: v1
+      SECRET_ADMIN_PASSWORD_VERSION: v1
 trigger:
   branch:
     - main
 ---
 kind: pipeline
-name: recipe release
+name: generate recipe catalogue
 steps:
   - name: release a new version
-    image: thecoopcloud/drone-abra:latest
+    image: plugins/downstream
     settings:
-      command: recipe collabora release
-      deploy_key:
-        from_secret: abra_bot_deploy_key
+      server: https://build.coopcloud.tech
+      token:
+        from_secret: drone_abra-bot_token
+      fork: true
+      repositories:
+        - toolshed/auto-recipes-catalogue-json
+
+trigger:
+  event: tag

.env.sample

@@ -4,3 +4,5 @@ LETS_ENCRYPT_ENV=production
 NEXTCLOUD_DOMAIN=nextcloud.example.com
 ADMIN_USERNAME=admin
 SECRET_ADMIN_PASSWORD_VERSION=v1
+FRAME_ANCESTORS=
+DICTIONARIES=de_DE en_GB en_US es_ES fr_FR it nl pt_BR pt_PT

README.md

@@ -18,9 +18,21 @@
 
 1. Set up Docker Swarm and [`abra`](https://git.autonomic.zone/coop-cloud/abra)
 1. Deploy [`coop-cloud/traefik`](https://git.autonomic.zone/coop-cloud/traefik)
-1. `abra app YOURAPPDOMAIN config` - be sure to change `$DOMAIN` to something that resolves to
+1. `abra app new collabora` to install collabora.
+1. `abra app config YOURAPPDOMAIN` - be sure to change `$DOMAIN` to something that resolves to
    your Docker swarm box
-1. `abra app YOURAPPDOMAIN deploy`
+1. `abra app deploy YOURAPPDOMAIN`
+1. In nextcloud, go to Admin->Office, select "Use your own server" and enter only the DOMAIN (including https://) in "URL (and Port) of Collabora Online-server".
+
+Admin Interface:
+
+`https://YOURAPPDOMAIN/browser/dist/admin/admin.html`
+
+## Languages for spell checking
+
+To change default languages for spell checking, add or remove language-codes (and optionally country code) from the DICTIONARIES-list when configuring your app. Consult list of [language codes](https://en.wikipedia.org/wiki/List_of_ISO_639_language_codes) and [country codes](https://en.wikipedia.org/wiki/List_of_ISO_3166_country_codes). For example:
+
+`DICTIONARIES=de_DE en_GB en_US es_ES fr_FR da_DK`
 
 ## Acknowledgements
 

abra.sh

@@ -1,2 +1,2 @@
-export NGINX_CONF_VERSION=v2
-export COOLWSD_XML_VERSION=v1
+export NGINX_CONF_VERSION=v3
+export COOLWSD_XML_VERSION=v2

compose.yml

@@ -3,7 +3,7 @@ version: "3.8"
 
 services:
   web:
-    image: "nginx:1.21.4"
+    image: "nginx:1.29.7"
     environment:
       - STACK_NAME
       - DOMAIN=${DOMAIN}
@@ -22,13 +22,29 @@ services:
         - "traefik.http.routers.${STACK_NAME}.rule=Host(`${DOMAIN}`)"
         - "traefik.http.routers.${STACK_NAME}.entrypoints=web-secure"
         - "traefik.http.routers.${STACK_NAME}.tls.certresolver=${LETS_ENCRYPT_ENV}"
+    healthcheck:
+      test:
+        [
+          "CMD-SHELL",
+          "curl -s -N localhost/hosting/capabilities |  grep Collabora",
+        ]
+      interval: 30s
+      timeout: 10s
+      retries: 10
+      start_period: 5m
 
   app:
-    image: "collabora/code:21.11.0.5.1"
+    image: "collabora/code:25.04.9.4.1"
     cap_add:
       - MKNOD
     secrets:
       - admin_password
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://localhost:9980"]
+      interval: 30s
+      timeout: 10s
+      retries: 10
+      start_period: 2m
     configs:
       - source: coolwsd_xml
         target: /etc/coolwsd/coolwsd.xml
@@ -39,11 +55,14 @@ services:
       - DOMAIN=${DOMAIN}
       - DONT_GEN_SSL_CERT=true
       - NEXTCLOUD_DOMAIN=${NEXTCLOUD_DOMAIN}
+      - FRAME_ANCESTORS
+      - DICTIONARIES
     networks:
       - internal
     deploy:
       labels:
-        - "coop-cloud.${STACK_NAME}.version=2.0.0+21.11.0.5.1"
+        - "coop-cloud.${STACK_NAME}.version=4.0.2+25.04.9.4.1"
+        - "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT:-120}"
 
 networks:
   proxy:

coolwsd.xml.tmpl

@@ -7,7 +7,8 @@
     <!-- Note: 'default' attributes are used to document a setting's default value as well as to use as fallback. -->
     <!-- Note: When adding a new entry, a default must be set in WSD in case the entry is missing upon deployment. -->
 
-    <allowed_languages desc="List of supported languages of Writing Aids (spell checker, grammar checker, thesaurus, hyphenation) on this instance. Allowing too many has negative effect on startup performance." default="de_DE en_GB en_US es_ES fr_FR it nl pt_BR pt_PT ru">de_DE en_GB en_US es_ES fr_FR it nl pt_BR pt_PT ru</allowed_languages>
+    <allowed_languages desc="List of supported languages of Writing Aids (spell checker, grammar checker, thesaurus, hyphenation) on this instance. Allowing too many has negative effect on startup performance." default="{{ env "DICTIONARIES" }}">{{ env "DICTIONARIES" }}</allowed_languages>
+
 
     <sys_template_path desc="Path to a template tree with shared libraries etc to be used as source for chroot jails for child processes." type="path" relative="true" default="systemplate"></sys_template_path>
     <child_root_path desc="Path to the directory under which the chroot jails for the child processes will be created. Should be on the same file system as systemplate and lotemplate. Must be an empty directory." type="path" relative="true" default="jails"></child_root_path>
@@ -125,7 +126,7 @@
         <host desc="The IPv4 private 10.0.0.0/8 subnet (Podman).">10\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}</host>
         <host desc="Ditto, but as IPv4-mapped IPv6 addresses">::ffff:10\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}</host>
       </post_allow>
-      <frame_ancestors desc="Specify who is allowed to embed the LO Online iframe (coolwsd and WOPI host are always allowed). Separate multiple hosts by space."></frame_ancestors>
+      <frame_ancestors desc="Specify who is allowed to embed the LO Online iframe (coolwsd and WOPI host are always allowed). Separate multiple hosts by space.">{{ env "FRAME_ANCESTORS" }}</frame_ancestors>
       <connection_timeout_secs desc="Specifies the connection, send, recv timeout in seconds for connections initiated by coolwsd (such as WOPI connections)." type="int" default="30"></connection_timeout_secs>
 
       <!-- this setting radically changes how online works, it should not be used in a production environment -->

nginx.conf.tmpl

@@ -5,8 +5,13 @@ events {
 }
 
 http {
+    resolver 127.0.0.11 valid=30s ipv6=off;
+    resolver_timeout 5s;
+
     upstream collabora-upstream {
-      server {{ env "STACK_NAME" }}_app:9980;
+      zone collabora-upstream 64k;
+      server {{ env "STACK_NAME" }}_app:9980 resolve;
+      keepalive 16;
     }
 
     server {

release/2.0.0+21.11.0.5.1

@@ -0,0 +1,11 @@
+Large performance boost on this new version.
+
+It's probably best to undeploy and deploy from scratch when doing this upgrade
+as a number of things like env vars have totally changed with this LOOL -> COOL
+migration in the new version.
+
+There is also a new admin username/password to deal with in the config.
+
+Read the blog post here for more background info:
+
+    https://www.collaboraoffice.com/code-21-11-release-notes/