From: mhoellein Date: Fri, 25 Sep 2020 06:20:12 +0000 (+0200) Subject: committing changes in /etc made by "apt-get upgrade linux-generic linux-headers-gener... X-Git-Url: https://git.hoellein.online/?a=commitdiff_plain;h=af724b83fc608ec67d10005d2329118e34215864;p=vserver committing changes in /etc made by "apt-get upgrade linux-generic linux-headers-generic linux-image-generic loolwsd" Package changes: +collaboraoffice6.4 6.4.10.5-5 amd64 +collaboraoffice6.4-ure 6.4.10.5-5 amd64 +collaboraofficebasis6.4-calc 6.4.10.5-5 amd64 +collaboraofficebasis6.4-core 6.4.10.5-5 amd64 +collaboraofficebasis6.4-draw 6.4.10.5-5 amd64 +collaboraofficebasis6.4-en-us 6.4.10.5-5 amd64 +collaboraofficebasis6.4-extension-pdf-import 6.4.10.5-5 amd64 +collaboraofficebasis6.4-graphicfilter 6.4.10.5-5 amd64 +collaboraofficebasis6.4-images 6.4.10.5-5 amd64 +collaboraofficebasis6.4-impress 6.4.10.5-5 amd64 +collaboraofficebasis6.4-ooofonts 6.4.10.5-5 amd64 +collaboraofficebasis6.4-ooolinguistic 6.4.10.5-5 amd64 +collaboraofficebasis6.4-writer 6.4.10.5-5 amd64 -linux-generic 5.4.0.40.43 amd64 +linux-generic 5.4.0.48.51 amd64 -linux-headers-generic 5.4.0.40.43 amd64 +linux-headers-5.4.0-48 5.4.0-48.52 all +linux-headers-5.4.0-48-generic 5.4.0-48.52 amd64 +linux-headers-generic 5.4.0.48.51 amd64 -linux-image-generic 5.4.0.40.43 amd64 +linux-image-5.4.0-48-generic 5.4.0-48.52 amd64 +linux-image-generic 5.4.0.48.51 amd64 +linux-modules-5.4.0-48-generic 5.4.0-48.52 amd64 +linux-modules-extra-5.4.0-48-generic 5.4.0-48.52 amd64 -loolwsd 4.2.6-2 amd64 +loolwsd 6.4.0-2 amd64 --- diff --git a/.etckeeper b/.etckeeper index 55dd22fae..2b8033c06 100755 --- a/.etckeeper +++ b/.etckeeper @@ -1561,6 +1561,7 @@ maybe chmod 0755 'ldap/schema' maybe chmod 0644 'ldap/schema/amavis.schema' maybe chmod 0644 'legal' maybe chmod 0755 'letsencrypt' +maybe chmod 0600 'letsencrypt/.certbot.lock' maybe chmod 0644 'letsencrypt/.updated-options-ssl-apache-conf-digest.txt' maybe chmod 0700 'letsencrypt/accounts' maybe chmod 0700 'letsencrypt/accounts/acme-staging-v02.api.letsencrypt.org' diff --git a/apt/apt.conf.d/01autoremove-kernels b/apt/apt.conf.d/01autoremove-kernels index 0ce4acfbd..899cc4c5f 100644 --- a/apt/apt.conf.d/01autoremove-kernels +++ b/apt/apt.conf.d/01autoremove-kernels @@ -1,47 +1,41 @@ // DO NOT EDIT! File autogenerated by /etc/kernel/postinst.d/apt-auto-removal APT::NeverAutoRemove { - "^linux-.*-4\.15\.0-109-generic$"; - "^linux-.*-4\.15\.0-64-generic$"; "^linux-.*-5\.4\.0-40-generic$"; - "^kfreebsd-.*-4\.15\.0-109-generic$"; - "^kfreebsd-.*-4\.15\.0-64-generic$"; + "^linux-.*-5\.4\.0-48-generic$"; "^kfreebsd-.*-5\.4\.0-40-generic$"; - "^gnumach-.*-4\.15\.0-109-generic$"; - "^gnumach-.*-4\.15\.0-64-generic$"; + "^kfreebsd-.*-5\.4\.0-48-generic$"; "^gnumach-.*-5\.4\.0-40-generic$"; - "^.*-modules-4\.15\.0-109-generic$"; - "^.*-modules-4\.15\.0-64-generic$"; + "^gnumach-.*-5\.4\.0-48-generic$"; "^.*-modules-5\.4\.0-40-generic$"; - "^.*-kernel-4\.15\.0-109-generic$"; - "^.*-kernel-4\.15\.0-64-generic$"; + "^.*-modules-5\.4\.0-48-generic$"; "^.*-kernel-5\.4\.0-40-generic$"; + "^.*-kernel-5\.4\.0-48-generic$"; }; /* Debug information: # dpkg list: -ii linux-image-4.15.0-109-generic 4.15.0-109.110 amd64 Signed kernel image generic +rc linux-image-4.15.0-109-generic 4.15.0-109.110 amd64 Signed kernel image generic rc linux-image-4.15.0-38-generic 4.15.0-38.41 amd64 Signed kernel image generic ii linux-image-4.15.0-64-generic 4.15.0-64.73 amd64 Signed kernel image generic -iF linux-image-5.4.0-40-generic 5.4.0-40.44 amd64 Signed kernel image generic -ii linux-image-generic 5.4.0.40.43 amd64 Generic Linux kernel image +ii linux-image-5.4.0-40-generic 5.4.0-40.44 amd64 Signed kernel image generic +iF linux-image-5.4.0-48-generic 5.4.0-48.52 amd64 Signed kernel image generic +ii linux-image-generic 5.4.0.48.51 amd64 Generic Linux kernel image # list of installed kernel packages: -4.15.0-109-generic 4.15.0-109.110 4.15.0-64-generic 4.15.0-64.73 5.4.0-40-generic 5.4.0-40.44 +5.4.0-48-generic 5.4.0-48.52 # list of different kernel versions: +5.4.0-48.52 5.4.0-40.44 -4.15.0-109.110 4.15.0-64.73 -# Installing kernel: 5.4.0-40.44 (5.4.0-40-generic) -# Running kernel: 4.15.0-64.73 (4.15.0-64-generic) -# Last kernel: 5.4.0-40.44 -# Previous kernel: 4.15.0-109.110 +# Installing kernel: 5.4.0-48.52 (5.4.0-48-generic) +# Running kernel: 5.4.0-40.44 (5.4.0-40-generic) +# Last kernel: 5.4.0-48.52 +# Previous kernel: 5.4.0-40.44 # Kernel versions list to keep: -4.15.0-109.110 -4.15.0-64.73 5.4.0-40.44 +5.4.0-48.52 # Kernel packages (version part) to protect: -4\.15\.0-109-generic -4\.15\.0-64-generic 5\.4\.0-40-generic +5\.4\.0-48-generic */ diff --git a/apt/apt.conf.d/25loolwsd b/apt/apt.conf.d/25loolwsd index d17ef9bb7..de34164e3 100644 --- a/apt/apt.conf.d/25loolwsd +++ b/apt/apt.conf.d/25loolwsd @@ -1,2 +1,2 @@ // Rebuild systemplate of Collabora Online Development Edition -DPkg::Post-Invoke { "echo Updating loolwsd systemplate;loolwsd-systemplate-setup /opt/lool/systemplate /opt/collaboraoffice6.2 >/dev/null 2>&1"; }; +DPkg::Post-Invoke { "echo Updating loolwsd systemplate;loolwsd-systemplate-setup /opt/lool/systemplate /opt/collaboraoffice6.4 >/dev/null 2>&1"; }; diff --git a/letsencrypt/.certbot.lock b/letsencrypt/.certbot.lock new file mode 100644 index 000000000..e69de29bb diff --git a/loolwsd/loolkitconfig.xcu b/loolwsd/loolkitconfig.xcu index a2a711711..1e1fe79a8 100644 --- a/loolwsd/loolkitconfig.xcu +++ b/loolwsd/loolkitconfig.xcu @@ -34,4 +34,10 @@ NeverMatchAnyUrlSuffix + +Calibri;Carlito;Liberation Sans;Albany AMT;Albany;Arial;Noto Sans;Arimo;Nimbus Sans L;DejaVu Sans;Helvetica;Lucida;Geneva;Helmet;Arial;Noto Sans Unicode MS;Lucida Sans Unicode;Tahoma;SansSerif +Calibri;Carlito;Liberation Sans;Albany AMT;Albany;Arial;Noto Sans;Arimo;Nimbus Sans L;DejaVu Sans;Helvetica;Lucida;Geneva;Helmet;Arial;Noto Sans Unicode MS;Lucida Sans Unicode;Tahoma;SansSerif +Calibri;Carlito;Liberation Sans;Albany AMT;Albany;Arial;Noto Sans;Arimo;Nimbus Sans L;DejaVu Sans;Helvetica;Lucida;Geneva;Helmet;Arial;Noto Sans Unicode MS;Lucida Sans Unicode;Tahoma;SansSerif +Calibri;Carlito;Liberation Sans;Albany AMT;Albany;Arial;Noto Sans;Arimo;Nimbus Sans L;DejaVu Sans;Helvetica;Lucida;Geneva;Helmet;Arial;Noto Sans Unicode MS;Lucida Sans Unicode;Tahoma;SansSerif + diff --git a/myssl/dh2048.pem b/myssl/dh2048.pem index fb2707890..b0c274f1a 100644 --- a/myssl/dh2048.pem +++ b/myssl/dh2048.pem @@ -1,8 +1,8 @@ -----BEGIN DH PARAMETERS----- -MIIBCAKCAQEAqP4O82iAyTciab/BlY1PCI0vV1oHfg81ZgwSYx/1r9hctLcdD4+3 -gTkuoco53WVjS7hr/7Btiop2V8tVYW5NnX08dUac1kCLJ1TO1n80UfnscuIvqkKN -YlF8H/KN+DzJhrJxyysQlYNrUqblyPAQE5sYdpavBeUyWDG2kiOU4aXp2FJpVqvR -t/zpJA70OO8+A34f7CyJnBq9EsDumN8WeoC5T5RprVwwp/KTUUmuV+c7T8vY8qRR -CSMEvyIdK/escPgUSaIDu8OFIz9UONYmKCUXFgJxll61HMBrGLOc4iudgPZ9gmYV -xsZuz+79a01Gyof9NRVdwf7C5YjEReweSwIBAg== +MIIBCAKCAQEAq7/eQ6LXM7sXP25lA4p0lZTqA2clSLGjhbPfnKWING+qTnu3Y+Cv +l4zKB5e/IpuVvyDLzHhgsgrixqPnLU64c98O2vk58HXNqLC7/fUJ0xXUty5aoV4/ +ZIVlAQT7aBTerBDJHt7msiuOWHxLdF6Ex8cNk//2xFx3RtrzyfeLYxeeisGfDlxX +82N5AiLjVG8tlVR5l5k+1qmf6dcpIhKx59oJbSjUdUXHX93TaZtJtmQM3F5ykEsO +KwQ4KCqZX4CVIEDT8jSWElzfZhJIRul6rQzmrj1eT0ib4btchweQMR38HXpnsCbf +ZMz+Jkz2njE6NgG+WfRILhjb6JA/S/SdowIBAg== -----END DH PARAMETERS-----