From 83b5a7ae692ae998bac3eb8c7aee3fa6d883e1cc Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Sat, 28 Oct 2023 15:32:47 +0200 Subject: sk-cloudio: prepare update of collabora --- .../templates/config/coolwsd.23.05.4.2.1.xml.j2 | 292 -------------------- .../templates/config/coolwsd.23.05.5.2.1.xml.j2 | 301 +++++++++++++++++++++ 2 files changed, 301 insertions(+), 292 deletions(-) delete mode 100644 roles/apps/collabora/code/templates/config/coolwsd.23.05.4.2.1.xml.j2 create mode 100644 roles/apps/collabora/code/templates/config/coolwsd.23.05.5.2.1.xml.j2 (limited to 'roles/apps/collabora') diff --git a/roles/apps/collabora/code/templates/config/coolwsd.23.05.4.2.1.xml.j2 b/roles/apps/collabora/code/templates/config/coolwsd.23.05.4.2.1.xml.j2 deleted file mode 100644 index e7705311..00000000 --- a/roles/apps/collabora/code/templates/config/coolwsd.23.05.4.2.1.xml.j2 +++ /dev/null @@ -1,292 +0,0 @@ - - - - - - - - - - false - - - de_DE en_GB en_US es_ES fr_FR it nl pt_BR pt_PT ru - - - - - - - - - - - - - false - - - - - - - - - {{ item.value.hostname }} - - - true - - - 1 - - - 4 - 5 - false - 96 - 3600 - 30 - 300 - false - 0 - 8000 - 0 - 0 - 100 - 5 - 100 - 500 - 5000 - - 10000 - 60 - 300 - 3072 - 85 - 120 - - - - - true - 120 - 900 - - - - - - true - - warning - trace - notice - fatal - false - - -INFO-WARN - - - /var/log/coolwsd.log - never - timestamp - true - 10 days - 10 - true - false - - - false - 82589933 - - false - false - - - - - /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\.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} - - - - - - - - - - - - true - - false - /etc/coolwsd/cert.pem - /etc/coolwsd/key.pem - /etc/coolwsd/ca-chain.cert.pem - - - 1000 - - - - - - - false - 31536000 - - - - - true - true - 1800 - {{ item.value.macros.allowed | default(false) | ternary('true', 'false') }} - {{ item.value.macros.security_level | default('1') }} - false - - - - - - - - - - - - - - default - true - - - - - - 0 - - 900 - - - -{% for backend in item.value.backend_storages %} - - https://{{ backend }}:443 - -{% endfor %} - - - - - true - - - - - - - - - - true - false - {{ item.value.admin.username }} - {{ item.value.admin.password }} - - - - - - - - - - - - - - - - - - - - - - - false - - - - log - - - - - - - - - - - - true - - - https://help.collaboraoffice.com/help.html? - - diff --git a/roles/apps/collabora/code/templates/config/coolwsd.23.05.5.2.1.xml.j2 b/roles/apps/collabora/code/templates/config/coolwsd.23.05.5.2.1.xml.j2 new file mode 100644 index 00000000..4b002328 --- /dev/null +++ b/roles/apps/collabora/code/templates/config/coolwsd.23.05.5.2.1.xml.j2 @@ -0,0 +1,301 @@ + + + + + + + + + + false + + + de_DE en_GB en_US es_ES fr_FR it nl pt_BR pt_PT ru + + + + + + + + + + + + + false + + + + + + + + + {{ item.value.hostname }} + + + true + + + 1 + + + 4 + 5 + false + 96 + 3600 + 30 + 300 + false + 0 + 8000 + 0 + 0 + 100 + 5 + 100 + 500 + 5000 + + 10000 + 60 + 300 + 3072 + 85 + 120 + + + + + true + 120 + 900 + + + + + + true + + warning + trace + notice + fatal + false + + -INFO-WARN + + + /var/log/coolwsd.log + never + timestamp + true + 10 days + 10 + true + false + + + false + 82589933 + + false + false + + + + + /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\.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} + + + + + + + + + + + + true + + false + /etc/coolwsd/cert.pem + /etc/coolwsd/key.pem + /etc/coolwsd/ca-chain.cert.pem + + + 1000 + + + + + + + false + 31536000 + + + + + true + true + 1800 + {{ item.value.macros.allowed | default(false) | ternary('true', 'false') }} + {{ item.value.macros.security_level | default('1') }} + false + false + + + + + + + + + + + + + + default + true + + + + + + 0 + + 900 + + + +{% for backend in item.value.backend_storages %} + + https://{{ backend }}:443 + +{% endfor %} + + + + + true + + + + + + + + + + true + false + {{ item.value.admin.username }} + {{ item.value.admin.password }} + + true + true + true + true + + + + + + + + + + + + + + + + + + + false + + + + + + + false + + + + log + + + + + + + + + + + + true + + + https://help.collaboraoffice.com/help.html? + + -- cgit v1.2.3