From: mhoellein Date: Mon, 15 Mar 2021 07:47:38 +0000 (+0100) Subject: committing changes in /etc made by "apt-get upgrade" X-Git-Url: https://git.hoellein.online/?a=commitdiff_plain;h=a1ac6d4ac80e3c2e3147a013f40327e4cc05b166;p=vserver committing changes in /etc made by "apt-get upgrade" Package changes: -apache2 2.4.46-2+ubuntu20.04.1+deb.sury.org+1 amd64 -apache2-bin 2.4.46-2+ubuntu20.04.1+deb.sury.org+1 amd64 -apache2-data 2.4.46-2+ubuntu20.04.1+deb.sury.org+1 all -apache2-utils 2.4.46-2+ubuntu20.04.1+deb.sury.org+1 amd64 +apache2 2.4.46-4+deb.sury.org+1+ubuntu20.04.1+deb.sury.org+5 amd64 +apache2-bin 2.4.46-4+deb.sury.org+1+ubuntu20.04.1+deb.sury.org+5 amd64 +apache2-data 2.4.46-4+deb.sury.org+1+ubuntu20.04.1+deb.sury.org+5 all +apache2-utils 2.4.46-4+deb.sury.org+1+ubuntu20.04.1+deb.sury.org+5 amd64 -libapr1 1.6.5-1+ubuntu20.04.1+deb.sury.org+1 amd64 -libaprutil1 1.6.1-5+ubuntu18.04.1+deb.sury.org+2 amd64 -libaprutil1-dbd-sqlite3 1.6.1-5+ubuntu18.04.1+deb.sury.org+2 amd64 -libaprutil1-ldap 1.6.1-5+ubuntu18.04.1+deb.sury.org+2 amd64 +libapr1 1.7.0-6+ubuntu20.04.1+deb.sury.org+2 amd64 +libaprutil1 1.6.1-5+ubuntu20.04.1+deb.sury.org+5 amd64 +libaprutil1-dbd-sqlite3 1.6.1-5+ubuntu20.04.1+deb.sury.org+5 amd64 +libaprutil1-ldap 1.6.1-5+ubuntu20.04.1+deb.sury.org+5 amd64 -loolwsd 6.4.6-7 amd64 +loolwsd 6.4.6-8 amd64 --- diff --git a/.etckeeper b/.etckeeper index 173d164ef..2b6c6b99f 100755 --- a/.etckeeper +++ b/.etckeeper @@ -5,7 +5,6 @@ mkdir -p './acpi/events' mkdir -p './apm/event.d' mkdir -p './apparmor.d/force-complain' mkdir -p './apt/auth.conf.d' -mkdir -p './apt/preferences.d' mkdir -p './binfmt.d' mkdir -p './ca-certificates/update.d' mkdir -p './dbus-1/session.d' @@ -676,6 +675,7 @@ maybe chmod 0644 'apt/apt.conf.d/50command-not-found' maybe chmod 0644 'apt/apt.conf.d/70debconf' maybe chmod 0755 'apt/auth.conf.d' maybe chmod 0755 'apt/preferences.d' +maybe chmod 0644 'apt/preferences.d/apache2-data.pref' maybe chmod 0644 'apt/sources.list' maybe chmod 0644 'apt/sources.list.bak' maybe chmod 0644 'apt/sources.list.bak2' @@ -1562,6 +1562,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/apache2/mods-available/deflate.conf b/apache2/mods-available/deflate.conf index dfd421be4..e891e03c4 100644 --- a/apache2/mods-available/deflate.conf +++ b/apache2/mods-available/deflate.conf @@ -3,6 +3,7 @@ AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css text/javascript AddOutputFilterByType DEFLATE application/x-javascript application/javascript application/ecmascript AddOutputFilterByType DEFLATE application/rss+xml + AddOutputFilterByType DEFLATE application/wasm AddOutputFilterByType DEFLATE application/xml diff --git a/apache2/mods-available/mime.conf b/apache2/mods-available/mime.conf index 37dac86c9..38f8eb51f 100644 --- a/apache2/mods-available/mime.conf +++ b/apache2/mods-available/mime.conf @@ -76,6 +76,7 @@ AddLanguage ca .ca AddLanguage cs .cz .cs AddLanguage cy .cy + AddLanguage da .da AddLanguage da .dk AddLanguage de .de AddLanguage dz .dz diff --git a/apt/preferences.d/apache2-data.pref b/apt/preferences.d/apache2-data.pref new file mode 100644 index 000000000..dd693aefc --- /dev/null +++ b/apt/preferences.d/apache2-data.pref @@ -0,0 +1,504 @@ +Package: openssl +Pin: release o=deb.sury.org, n=stretch* +Pin-Priority: -1 + +Package: libssl1.1 +Pin: release o=deb.sury.org, n=stretch* +Pin-Priority: -1 + +Package: libcrypto1.1-udeb +Pin: release o=deb.sury.org, n=stretch* +Pin-Priority: -1 + +Package: libssl1.1-udeb +Pin: release o=deb.sury.org, n=stretch* +Pin-Priority: -1 + +Package: libssl-dev +Pin: release o=deb.sury.org, n=stretch* +Pin-Priority: -1 + +Package: libssl-doc +Pin: release o=deb.sury.org, n=stretch* +Pin-Priority: -1 + +Package: openssl +Pin: release o=deb.sury.org, n=buster* +Pin-Priority: -1 + +Package: libssl1.1 +Pin: release o=deb.sury.org, n=buster* +Pin-Priority: -1 + +Package: libcrypto1.1-udeb +Pin: release o=deb.sury.org, n=buster* +Pin-Priority: -1 + +Package: libssl1.1-udeb +Pin: release o=deb.sury.org, n=buster* +Pin-Priority: -1 + +Package: libssl-dev +Pin: release o=deb.sury.org, n=buster* +Pin-Priority: -1 + +Package: libssl-doc +Pin: release o=deb.sury.org, n=buster* +Pin-Priority: -1 + +Package: openssl +Pin: release o=deb.sury.org, n=bullseye* +Pin-Priority: -1 + +Package: libssl1.1 +Pin: release o=deb.sury.org, n=bullseye* +Pin-Priority: -1 + +Package: libcrypto1.1-udeb +Pin: release o=deb.sury.org, n=bullseye* +Pin-Priority: -1 + +Package: libssl1.1-udeb +Pin: release o=deb.sury.org, n=bullseye* +Pin-Priority: -1 + +Package: libssl-dev +Pin: release o=deb.sury.org, n=bullseye* +Pin-Priority: -1 + +Package: libssl-doc +Pin: release o=deb.sury.org, n=bullseye* +Pin-Priority: -1 + +Package: openssl +Pin: release o=LP-PPA-ondrej-php, n=bionic* +Pin-Priority: -1 + +Package: libssl1.1 +Pin: release o=LP-PPA-ondrej-php, n=bionic* +Pin-Priority: -1 + +Package: libcrypto1.1-udeb +Pin: release o=LP-PPA-ondrej-php, n=bionic* +Pin-Priority: -1 + +Package: libssl1.1-udeb +Pin: release o=LP-PPA-ondrej-php, n=bionic* +Pin-Priority: -1 + +Package: libssl-dev +Pin: release o=LP-PPA-ondrej-php, n=bionic* +Pin-Priority: -1 + +Package: libssl-doc +Pin: release o=LP-PPA-ondrej-php, n=bionic* +Pin-Priority: -1 + +Package: openssl +Pin: release o=LP-PPA-ondrej-php, n=focal* +Pin-Priority: -1 + +Package: libssl1.1 +Pin: release o=LP-PPA-ondrej-php, n=focal* +Pin-Priority: -1 + +Package: libcrypto1.1-udeb +Pin: release o=LP-PPA-ondrej-php, n=focal* +Pin-Priority: -1 + +Package: libssl1.1-udeb +Pin: release o=LP-PPA-ondrej-php, n=focal* +Pin-Priority: -1 + +Package: libssl-dev +Pin: release o=LP-PPA-ondrej-php, n=focal* +Pin-Priority: -1 + +Package: libssl-doc +Pin: release o=LP-PPA-ondrej-php, n=focal* +Pin-Priority: -1 + +Package: openssl +Pin: release o=LP-PPA-ondrej-php, n=groovy* +Pin-Priority: -1 + +Package: libssl1.1 +Pin: release o=LP-PPA-ondrej-php, n=groovy* +Pin-Priority: -1 + +Package: libcrypto1.1-udeb +Pin: release o=LP-PPA-ondrej-php, n=groovy* +Pin-Priority: -1 + +Package: libssl1.1-udeb +Pin: release o=LP-PPA-ondrej-php, n=groovy* +Pin-Priority: -1 + +Package: libssl-dev +Pin: release o=LP-PPA-ondrej-php, n=groovy* +Pin-Priority: -1 + +Package: libssl-doc +Pin: release o=LP-PPA-ondrej-php, n=groovy* +Pin-Priority: -1 + +Package: openssl +Pin: release o=LP-PPA-ondrej-apache2, n=bionic* +Pin-Priority: -1 + +Package: libssl1.1 +Pin: release o=LP-PPA-ondrej-apache2, n=bionic* +Pin-Priority: -1 + +Package: libcrypto1.1-udeb +Pin: release o=LP-PPA-ondrej-apache2, n=bionic* +Pin-Priority: -1 + +Package: libssl1.1-udeb +Pin: release o=LP-PPA-ondrej-apache2, n=bionic* +Pin-Priority: -1 + +Package: libssl-dev +Pin: release o=LP-PPA-ondrej-apache2, n=bionic* +Pin-Priority: -1 + +Package: libssl-doc +Pin: release o=LP-PPA-ondrej-apache2, n=bionic* +Pin-Priority: -1 + +Package: openssl +Pin: release o=LP-PPA-ondrej-apache2, n=focal* +Pin-Priority: -1 + +Package: libssl1.1 +Pin: release o=LP-PPA-ondrej-apache2, n=focal* +Pin-Priority: -1 + +Package: libcrypto1.1-udeb +Pin: release o=LP-PPA-ondrej-apache2, n=focal* +Pin-Priority: -1 + +Package: libssl1.1-udeb +Pin: release o=LP-PPA-ondrej-apache2, n=focal* +Pin-Priority: -1 + +Package: libssl-dev +Pin: release o=LP-PPA-ondrej-apache2, n=focal* +Pin-Priority: -1 + +Package: libssl-doc +Pin: release o=LP-PPA-ondrej-apache2, n=focal* +Pin-Priority: -1 + +Package: openssl +Pin: release o=LP-PPA-ondrej-apache2, n=groovy* +Pin-Priority: -1 + +Package: libssl1.1 +Pin: release o=LP-PPA-ondrej-apache2, n=groovy* +Pin-Priority: -1 + +Package: libcrypto1.1-udeb +Pin: release o=LP-PPA-ondrej-apache2, n=groovy* +Pin-Priority: -1 + +Package: libssl1.1-udeb +Pin: release o=LP-PPA-ondrej-apache2, n=groovy* +Pin-Priority: -1 + +Package: libssl-dev +Pin: release o=LP-PPA-ondrej-apache2, n=groovy* +Pin-Priority: -1 + +Package: libssl-doc +Pin: release o=LP-PPA-ondrej-apache2, n=groovy* +Pin-Priority: -1 + +Package: openssl +Pin: release o=LP-PPA-ondrej-nginx, n=bionic* +Pin-Priority: -1 + +Package: libssl1.1 +Pin: release o=LP-PPA-ondrej-nginx, n=bionic* +Pin-Priority: -1 + +Package: libcrypto1.1-udeb +Pin: release o=LP-PPA-ondrej-nginx, n=bionic* +Pin-Priority: -1 + +Package: libssl1.1-udeb +Pin: release o=LP-PPA-ondrej-nginx, n=bionic* +Pin-Priority: -1 + +Package: libssl-dev +Pin: release o=LP-PPA-ondrej-nginx, n=bionic* +Pin-Priority: -1 + +Package: libssl-doc +Pin: release o=LP-PPA-ondrej-nginx, n=bionic* +Pin-Priority: -1 + +Package: openssl +Pin: release o=LP-PPA-ondrej-nginx, n=focal* +Pin-Priority: -1 + +Package: libssl1.1 +Pin: release o=LP-PPA-ondrej-nginx, n=focal* +Pin-Priority: -1 + +Package: libcrypto1.1-udeb +Pin: release o=LP-PPA-ondrej-nginx, n=focal* +Pin-Priority: -1 + +Package: libssl1.1-udeb +Pin: release o=LP-PPA-ondrej-nginx, n=focal* +Pin-Priority: -1 + +Package: libssl-dev +Pin: release o=LP-PPA-ondrej-nginx, n=focal* +Pin-Priority: -1 + +Package: libssl-doc +Pin: release o=LP-PPA-ondrej-nginx, n=focal* +Pin-Priority: -1 + +Package: openssl +Pin: release o=LP-PPA-ondrej-nginx, n=groovy* +Pin-Priority: -1 + +Package: libssl1.1 +Pin: release o=LP-PPA-ondrej-nginx, n=groovy* +Pin-Priority: -1 + +Package: libcrypto1.1-udeb +Pin: release o=LP-PPA-ondrej-nginx, n=groovy* +Pin-Priority: -1 + +Package: libssl1.1-udeb +Pin: release o=LP-PPA-ondrej-nginx, n=groovy* +Pin-Priority: -1 + +Package: libssl-dev +Pin: release o=LP-PPA-ondrej-nginx, n=groovy* +Pin-Priority: -1 + +Package: libssl-doc +Pin: release o=LP-PPA-ondrej-nginx, n=groovy* +Pin-Priority: -1 + +Package: openssl +Pin: release o=LP-PPA-ondrej-nginx-mainline, n=bionic* +Pin-Priority: -1 + +Package: libssl1.1 +Pin: release o=LP-PPA-ondrej-nginx-mainline, n=bionic* +Pin-Priority: -1 + +Package: libcrypto1.1-udeb +Pin: release o=LP-PPA-ondrej-nginx-mainline, n=bionic* +Pin-Priority: -1 + +Package: libssl1.1-udeb +Pin: release o=LP-PPA-ondrej-nginx-mainline, n=bionic* +Pin-Priority: -1 + +Package: libssl-dev +Pin: release o=LP-PPA-ondrej-nginx-mainline, n=bionic* +Pin-Priority: -1 + +Package: libssl-doc +Pin: release o=LP-PPA-ondrej-nginx-mainline, n=bionic* +Pin-Priority: -1 + +Package: openssl +Pin: release o=LP-PPA-ondrej-nginx-mainline, n=focal* +Pin-Priority: -1 + +Package: libssl1.1 +Pin: release o=LP-PPA-ondrej-nginx-mainline, n=focal* +Pin-Priority: -1 + +Package: libcrypto1.1-udeb +Pin: release o=LP-PPA-ondrej-nginx-mainline, n=focal* +Pin-Priority: -1 + +Package: libssl1.1-udeb +Pin: release o=LP-PPA-ondrej-nginx-mainline, n=focal* +Pin-Priority: -1 + +Package: libssl-dev +Pin: release o=LP-PPA-ondrej-nginx-mainline, n=focal* +Pin-Priority: -1 + +Package: libssl-doc +Pin: release o=LP-PPA-ondrej-nginx-mainline, n=focal* +Pin-Priority: -1 + +Package: openssl +Pin: release o=LP-PPA-ondrej-nginx-mainline, n=groovy* +Pin-Priority: -1 + +Package: libssl1.1 +Pin: release o=LP-PPA-ondrej-nginx-mainline, n=groovy* +Pin-Priority: -1 + +Package: libcrypto1.1-udeb +Pin: release o=LP-PPA-ondrej-nginx-mainline, n=groovy* +Pin-Priority: -1 + +Package: libssl1.1-udeb +Pin: release o=LP-PPA-ondrej-nginx-mainline, n=groovy* +Pin-Priority: -1 + +Package: libssl-dev +Pin: release o=LP-PPA-ondrej-nginx-mainline, n=groovy* +Pin-Priority: -1 + +Package: libssl-doc +Pin: release o=LP-PPA-ondrej-nginx-mainline, n=groovy* +Pin-Priority: -1 + +Package: openssl +Pin: release o=Debian, n=stretch* +Pin-Priority: 1000 + +Package: libssl1.1 +Pin: release o=Debian, n=stretch* +Pin-Priority: 1000 + +Package: libcrypto1.1-udeb +Pin: release o=Debian, n=stretch* +Pin-Priority: 1000 + +Package: libssl1.1-udeb +Pin: release o=Debian, n=stretch* +Pin-Priority: 1000 + +Package: libssl-dev +Pin: release o=Debian, n=stretch* +Pin-Priority: 1000 + +Package: libssl-doc +Pin: release o=Debian, n=stretch* +Pin-Priority: 1000 + +Package: openssl +Pin: release o=Debian, n=buster* +Pin-Priority: 1000 + +Package: libssl1.1 +Pin: release o=Debian, n=buster* +Pin-Priority: 1000 + +Package: libcrypto1.1-udeb +Pin: release o=Debian, n=buster* +Pin-Priority: 1000 + +Package: libssl1.1-udeb +Pin: release o=Debian, n=buster* +Pin-Priority: 1000 + +Package: libssl-dev +Pin: release o=Debian, n=buster* +Pin-Priority: 1000 + +Package: libssl-doc +Pin: release o=Debian, n=buster* +Pin-Priority: 1000 + +Package: openssl +Pin: release o=Debian, n=bullseye* +Pin-Priority: 1000 + +Package: libssl1.1 +Pin: release o=Debian, n=bullseye* +Pin-Priority: 1000 + +Package: libcrypto1.1-udeb +Pin: release o=Debian, n=bullseye* +Pin-Priority: 1000 + +Package: libssl1.1-udeb +Pin: release o=Debian, n=bullseye* +Pin-Priority: 1000 + +Package: libssl-dev +Pin: release o=Debian, n=bullseye* +Pin-Priority: 1000 + +Package: libssl-doc +Pin: release o=Debian, n=bullseye* +Pin-Priority: 1000 + +Package: openssl +Pin: release o=Ubuntu, n=bionic* +Pin-Priority: 1000 + +Package: libssl1.1 +Pin: release o=Ubuntu, n=bionic* +Pin-Priority: 1000 + +Package: libcrypto1.1-udeb +Pin: release o=Ubuntu, n=bionic* +Pin-Priority: 1000 + +Package: libssl1.1-udeb +Pin: release o=Ubuntu, n=bionic* +Pin-Priority: 1000 + +Package: libssl-dev +Pin: release o=Ubuntu, n=bionic* +Pin-Priority: 1000 + +Package: libssl-doc +Pin: release o=Ubuntu, n=bionic* +Pin-Priority: 1000 + +Package: openssl +Pin: release o=Ubuntu, n=focal* +Pin-Priority: 1000 + +Package: libssl1.1 +Pin: release o=Ubuntu, n=focal* +Pin-Priority: 1000 + +Package: libcrypto1.1-udeb +Pin: release o=Ubuntu, n=focal* +Pin-Priority: 1000 + +Package: libssl1.1-udeb +Pin: release o=Ubuntu, n=focal* +Pin-Priority: 1000 + +Package: libssl-dev +Pin: release o=Ubuntu, n=focal* +Pin-Priority: 1000 + +Package: libssl-doc +Pin: release o=Ubuntu, n=focal* +Pin-Priority: 1000 + +Package: openssl +Pin: release o=Ubuntu, n=groovy* +Pin-Priority: 1000 + +Package: libssl1.1 +Pin: release o=Ubuntu, n=groovy* +Pin-Priority: 1000 + +Package: libcrypto1.1-udeb +Pin: release o=Ubuntu, n=groovy* +Pin-Priority: 1000 + +Package: libssl1.1-udeb +Pin: release o=Ubuntu, n=groovy* +Pin-Priority: 1000 + +Package: libssl-dev +Pin: release o=Ubuntu, n=groovy* +Pin-Priority: 1000 + +Package: libssl-doc +Pin: release o=Ubuntu, n=groovy* +Pin-Priority: 1000 + diff --git a/letsencrypt/.certbot.lock b/letsencrypt/.certbot.lock new file mode 100644 index 000000000..e69de29bb