From 4e13b02041c16bf1d5a1bcdb2c23825a5bd59947 Mon Sep 17 00:00:00 2001 From: mhoellein Date: Mon, 3 Apr 2023 21:51:34 +0200 Subject: [PATCH] committing changes in /etc made by "apt-get upgrade" Package changes: -code-brand 21.11-12 all -collaboraoffice 21.06.10-1 amd64 -collaboraoffice-ure 21.06.10-1 amd64 -collaboraofficebasis-calc 21.06.10-1 amd64 -collaboraofficebasis-core 21.06.10-1 amd64 -collaboraofficebasis-draw 21.06.10-1 amd64 -collaboraofficebasis-en-us 21.06.10-1 amd64 -collaboraofficebasis-extension-pdf-import 21.06.10-1 amd64 -collaboraofficebasis-graphicfilter 21.06.10-1 amd64 -collaboraofficebasis-images 21.06.10-1 amd64 -collaboraofficebasis-impress 21.06.10-1 amd64 -collaboraofficebasis-math 21.06.10-1 amd64 -collaboraofficebasis-ooofonts 21.06.10-1 amd64 -collaboraofficebasis-ooolinguistic 21.06.10-1 amd64 -collaboraofficebasis-writer 21.06.10-1 amd64 +code-brand 22.05-28 all +collaboraoffice 22.05.12-3 amd64 +collaboraoffice-ure 22.05.12-3 amd64 +collaboraofficebasis-calc 22.05.12-3 amd64 +collaboraofficebasis-core 22.05.12-3 amd64 +collaboraofficebasis-draw 22.05.12-3 amd64 +collaboraofficebasis-en-us 22.05.12-3 amd64 +collaboraofficebasis-extension-pdf-import 22.05.12-3 amd64 +collaboraofficebasis-graphicfilter 22.05.12-3 amd64 +collaboraofficebasis-images 22.05.12-3 amd64 +collaboraofficebasis-impress 22.05.12-3 amd64 +collaboraofficebasis-math 22.05.12-3 amd64 +collaboraofficebasis-ooofonts 22.05.12-3 amd64 +collaboraofficebasis-ooolinguistic 22.05.12-3 amd64 +collaboraofficebasis-writer 22.05.12-3 amd64 -coolwsd 21.11.0.6-1 amd64 +coolwsd 22.05.12.4-1 amd64 --- .etckeeper | 6 +- coolwsd/coolkitconfig.xcu | 26 +- coolwsd/coolwsd.xml | 458 ++++++++++-------- loolwsd/{loolwsd.xml => loolwsd.xml.migrated} | 0 4 files changed, 268 insertions(+), 222 deletions(-) rename loolwsd/{loolwsd.xml => loolwsd.xml.migrated} (100%) diff --git a/.etckeeper b/.etckeeper index 6e329d8c3..6f642cd9e 100755 --- a/.etckeeper +++ b/.etckeeper @@ -14398,9 +14398,9 @@ maybe chmod 0644 'loolwsd/cert.pem' maybe chmod 0644 'loolwsd/chain.pem' maybe chmod 0644 'loolwsd/key.pem' maybe chmod 0644 'loolwsd/loolkitconfig.xcu' -maybe chown 'lool' 'loolwsd/loolwsd.xml' -maybe chgrp 'lool' 'loolwsd/loolwsd.xml' -maybe chmod 0640 'loolwsd/loolwsd.xml' +maybe chown 'lool' 'loolwsd/loolwsd.xml.migrated' +maybe chgrp 'lool' 'loolwsd/loolwsd.xml.migrated' +maybe chmod 0640 'loolwsd/loolwsd.xml.migrated' maybe chown 'lool' 'loolwsd/proof_key' maybe chgrp 'lool' 'loolwsd/proof_key' maybe chmod 0600 'loolwsd/proof_key' diff --git a/coolwsd/coolkitconfig.xcu b/coolwsd/coolkitconfig.xcu index ac1e37598..08b92e11f 100644 --- a/coolwsd/coolkitconfig.xcu +++ b/coolwsd/coolkitconfig.xcu @@ -25,11 +25,7 @@ true - -collabora_svg -2 - - + false false false @@ -49,4 +45,24 @@ false false +org.openoffice.lingu.LanguageToolGrammarChecker +org.openoffice.lingu.LanguageToolGrammarChecker +org.openoffice.lingu.LanguageToolGrammarChecker +org.openoffice.lingu.LanguageToolGrammarChecker +org.openoffice.lingu.LanguageToolGrammarChecker +org.openoffice.lingu.LanguageToolGrammarChecker +org.openoffice.lingu.LanguageToolGrammarChecker +org.openoffice.lingu.LanguageToolGrammarChecker +org.openoffice.lingu.LanguageToolGrammarChecker +org.openoffice.lingu.LanguageToolGrammarChecker +org.openoffice.lingu.LanguageToolGrammarChecker +org.openoffice.lingu.LanguageToolGrammarChecker +org.openoffice.lingu.LanguageToolGrammarChecker +org.openoffice.lingu.LanguageToolGrammarChecker +org.openoffice.lingu.LanguageToolGrammarChecker +org.openoffice.lingu.LanguageToolGrammarChecker + + +anydefaulthidden + diff --git a/coolwsd/coolwsd.xml b/coolwsd/coolwsd.xml index 7348fef6e..c38e8e6a8 100644 --- a/coolwsd/coolwsd.xml +++ b/coolwsd/coolwsd.xml @@ -1,229 +1,259 @@ - - - - - - - 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 - + + de_DE en_GB en_US es_ES fr_FR it nl pt_BR pt_PT ru + + + + + + + + + + + false + + + + + + + + + + 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 - notice - fatal - false - - -INFO-WARN - - - /var/log/coolwsd.log - never - timestamp - true - 10 days - 10 - true - false - - - false - 82589933 - - - - + /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\.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 - - - - - - - - - - - - - - - - - - + + + 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/loolwsd/chain.pem + + + 1000 + + + + + + + false + 31536000 + + + + true + true + 1800 + false + 1 + false + + + + + + + + + + default + true + + + + + 0 + + 900 + + + + + + + localhost + collabora.hoellein.online + 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 + + + true + + + + + + + + true + + true + false + + + + + + + + + + + + + + + + + + false + + + log + + + + + + true + diff --git a/loolwsd/loolwsd.xml b/loolwsd/loolwsd.xml.migrated similarity index 100% rename from loolwsd/loolwsd.xml rename to loolwsd/loolwsd.xml.migrated -- 2.43.0