diff --git a/.env.sample b/.env.sample
index 26c2654..2a5327c 100644
--- a/.env.sample
+++ b/.env.sample
@@ -5,4 +5,6 @@ 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
\ No newline at end of file
+DICTIONARIES=de_DE en_GB en_US es_ES fr_FR it nl pt_BR pt_PT
+# here you can add additional env vars in case it is necessary for your instance
+#COLLABORA_ENV_PARAMS=
diff --git a/abra.sh b/abra.sh
index bf90b1a..688a82f 100644
--- a/abra.sh
+++ b/abra.sh
@@ -1,2 +1,2 @@
export NGINX_CONF_VERSION=v3
-export COOLWSD_XML_VERSION=v2
+export COOLWSD_XML_VERSION=v3
diff --git a/compose.yml b/compose.yml
index 9b5926c..bfef10a 100644
--- a/compose.yml
+++ b/compose.yml
@@ -34,22 +34,21 @@ services:
start_period: 5m
app:
- image: "collabora/code:25.04.9.4.1"
+ image: "collabora/code:26.04.3.2.1"
cap_add:
- MKNOD
secrets:
- admin_password
healthcheck:
- test: ["CMD", "curl", "-f", "http://localhost:9980"]
+ test: ["CMD", "/usr/bin/coolwsd", "--probe"]
interval: 30s
timeout: 10s
- retries: 10
- start_period: 2m
+ retries: 3
configs:
- source: coolwsd_xml
target: /etc/coolwsd/coolwsd.xml
- uid: "104" # lool
- gid: "106" # lool
+ uid: "1001" # cool user
+ gid: "1001" # cool user
environment:
- ADMIN_USERNAME
- DOMAIN=${DOMAIN}
@@ -57,6 +56,7 @@ services:
- NEXTCLOUD_DOMAIN=${NEXTCLOUD_DOMAIN}
- FRAME_ANCESTORS
- DICTIONARIES
+ - extra_params=--o:ssl.enable=false --o:ssl.termination=true ${COLLABORA_ENV_PARAMS}
networks:
- internal
deploy:
diff --git a/coolwsd.xml.tmpl b/coolwsd.xml.tmpl
index 609d256..6723f6d 100644
--- a/coolwsd.xml.tmpl
+++ b/coolwsd.xml.tmpl
@@ -7,37 +7,84 @@
+
+ false
+
+
{{ env "DICTIONARIES" }}
+
+
+ false
+
+
+
+ true
+
+
+
+
+ false
+ true
+ true
+
+
+
+
+
+
+
+
+ 30
+
+
+
+
+ false
+
+
+
-
+ false
-
+
-
+ false
+ true
-
- 4
+
+ 4
+ 10
+ true
+ false
6
5
-
+ 5
+ 120
false
- 96
3600
-
-
- 30
- 300
- false
+ 30
+ 300
+ true
+ true
+ false
0
8000
- 0
- 0
+ 0
+ 0
100
+ 5
100
+ 500
+ 5000
10000
60
@@ -49,8 +96,10 @@
- 120
+ 300
900
+
+ 6
@@ -63,6 +112,8 @@
Makefile.am, not here.
-->
warning
+ trace
+ Socket,WebSocket,Admin,Pixel
notice
fatal
false
@@ -70,7 +121,7 @@
See also: https://docs.libreoffice.org/sal/html/sal_log.html -->
-INFO-WARN
-
+
/var/log/coolwsd.log
never
timestamp
@@ -83,9 +134,27 @@
false
82589933
+ false
+ false
+ false
+ false
+ true
+
+
+ true
+ true
+
+
+ /var/log/coolwsd-ui-cmd.log
+ 10
+ true
+ false
+
+
+
-
+
+
192\.168\.[0-9]{1,3}\.[0-9]{1,3}
::ffff:192\.168\.[0-9]{1,3}\.[0-9]{1,3}
127\.0\.0\.1
::ffff:127\.0\.0\.1
::1
- 172\.17\.[0-9]{1,3}\.[0-9]{1,3}
- ::ffff:172\.17\.[0-9]{1,3}\.[0-9]{1,3}
+ 172\.1[6789]\.[0-9]{1,3}\.[0-9]{1,3}
+ ::ffff:172\.1[6789]\.[0-9]{1,3}\.[0-9]{1,3}
+ 172\.2[0-9]\.[0-9]{1,3}\.[0-9]{1,3}
+ ::ffff:172\.2[0-9]\.[0-9]{1,3}\.[0-9]{1,3}
+ 172\.3[01]\.[0-9]{1,3}\.[0-9]{1,3}
+ ::ffff:172\.3[01]\.[0-9]{1,3}\.[0-9]{1,3}
10\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}
::ffff:10\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}
- {{ env "FRAME_ANCESTORS" }}
-
+
+ 192\.168\.[0-9]{1,3}\.[0-9]{1,3}
+ ::ffff:192\.168\.[0-9]{1,3}\.[0-9]{1,3}
+ 127\.0\.0\.1
+ ::ffff:127\.0\.0\.1
+ ::1
+ 172\.1[6789]\.[0-9]{1,3}\.[0-9]{1,3}
+ ::ffff:172\.1[6789]\.[0-9]{1,3}\.[0-9]{1,3}
+ 172\.2[0-9]\.[0-9]{1,3}\.[0-9]{1,3}
+ ::ffff:172\.2[0-9]\.[0-9]{1,3}\.[0-9]{1,3}
+ 172\.3[01]\.[0-9]{1,3}\.[0-9]{1,3}
+ ::ffff:172\.3[01]\.[0-9]{1,3}\.[0-9]{1,3}
+ 10\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}
+ ::ffff:10\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}
+ localhost
+
+
+
+
+
+ 30
-
+ false
false
- true
- /etc/coolwsd/cert.pem
- /etc/coolwsd/key.pem
- /etc/coolwsd/ca-chain.cert.pem
-
+ false
+ /etc/coolwsd/cert.pem
+ /etc/coolwsd/key.pem
+ /etc/coolwsd/ca-chain.cert.pem
+ false
+
- 1000
-
+ 1000
+
+
+ false
+ 31536000
+
- true
+ true
+
+
true
+
1800
- false
+ false
1
false
+ false
+
+
+
+
-
+ 0.2
-
- false
- false
-
-
+
+
+
- notebookbar
+ default
+ true
+ true
+
+
+
+
+
+
+
+
- {{ env "NEXTCLOUD_DOMAIN" }}
- localhost
- 10\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}
- 172\.1[6789]\.[0-9]{1,3}\.[0-9]{1,3}
- 172\.2[0-9]\.[0-9]{1,3}\.[0-9]{1,3}
- 172\.3[01]\.[0-9]{1,3}\.[0-9]{1,3}
- 192\.168\.[0-9]{1,3}\.[0-9]{1,3}
- 192\.168\.1\.1
0
900
+
+
+
+
+ {{ env "NEXTCLOUD_DOMAIN" }}
+
+
+
+
+
+ false
+
+
+ 0
+ 60
+
+ false
true
-
-
-
+
+
+
- true
-
true
false
{{ env "ADMIN_USERNAME" }}
{{ secret "admin_password" }}
+
+ true
+ true
+ true
+ true
+
+
-
-
-
-
+ 250
+ 5
+
+ 3000
+
+
+ 1000
+
+
+ false
+ false
+ false
+ false
+ false
+ false
+
+
+ 3600
+ 5
+
+
+
+
+
+ false
+
+
+
+
+
+
+ log
+
+
+
+
+ 180
+
+ false
+
+
+
+
+
+
+
+
+
+ false
+
+
+
+
+
+
+
+ true
+
+
+
+
+
+
+
+ false
+
+
+
+ false
+
+
+
+ true
+