From 89bdd1b069bc640fb9929b7a00540433eeb51325 Mon Sep 17 00:00:00 2001 From: cellarspoon Date: Wed, 15 Dec 2021 09:44:05 +0100 Subject: [PATCH] fix: switch over to coolwsd --- abra.sh | 2 +- compose.yml | 10 +-- coolwsd.xml.tmpl | 225 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 231 insertions(+), 6 deletions(-) create mode 100644 coolwsd.xml.tmpl diff --git a/abra.sh b/abra.sh index bb6c07d..b44d613 100644 --- a/abra.sh +++ b/abra.sh @@ -1,2 +1,2 @@ export NGINX_CONF_VERSION=v2 -export LOOLWSD_XML_VERSION=v3 +export COOLWSD_XML_VERSION=v1 diff --git a/compose.yml b/compose.yml index 5cb9602..4d914b7 100644 --- a/compose.yml +++ b/compose.yml @@ -28,8 +28,8 @@ services: cap_add: - MKNOD configs: - - source: loolwsd_xml - target: /etc/loolwsd/loolwsd.xml + - source: coolwsd_xml + target: /etc/coolwsd/coolwsd.xml uid: "104" # lool gid: "106" # lool environment: @@ -48,7 +48,7 @@ configs: name: ${STACK_NAME}_nginx_conf_${NGINX_CONF_VERSION} file: nginx.conf.tmpl template_driver: golang - loolwsd_xml: - name: ${STACK_NAME}_loolwsd_xml_${LOOLWSD_XML_VERSION} - file: loolwsd.xml.tmpl + coolwsd_xml: + name: ${STACK_NAME}_coolwsd_xml_${COOLWSD_XML_VERSION} + file: coolwsd.xml.tmpl template_driver: golang diff --git a/coolwsd.xml.tmpl b/coolwsd.xml.tmpl new file mode 100644 index 0000000..4afd8a1 --- /dev/null +++ b/coolwsd.xml.tmpl @@ -0,0 +1,225 @@ + + + + + + + + + de_DE en_GB en_US es_ES fr_FR it nl pt_BR pt_PT ru + + + + + + + + + + + 1 + + 4 + 5 + + false + 96 + 3600 + + + 30 + 300 + false + 0 + 8000 + 0 + 0 + 100 + 100 + + 10000 + 60 + 300 + 3072 + 85 + 120 + + + + + 120 + 900 + + + + + + true + + warning + notice + fatal + false + + -INFO-WARN + + + /var/log/coolwsd.log + never + timestamp + true + 10 days + 10 + true + false + + + false + 82589933 + + + + + + /var/log/coolwsd.trace.json + + + false + + + + + + + + false + + + + + + all + any + + + + 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} + 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} + + + + + + + + + + + true + + false + /etc/coolwsd/cert.pem + /etc/coolwsd/key.pem + /etc/coolwsd/ca-chain.cert.pem + + + 1000 + + + + + + + + + true + true + 1800 + false + 1 + false + + + + + + + + + true + false + + + + + default + + + + + + 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 + + + + true + + + + + + + + + true + + + true + false + + + + + + + + + + + + + + + + + + +