From: mhoellein Date: Wed, 15 Sep 2021 05:35:02 +0000 (+0200) Subject: committing changes in /etc after apt run X-Git-Url: https://git.hoellein.online/?a=commitdiff_plain;h=a5ecc47fd9250ca79a9cc97ad7402830f074e848;p=homeserver committing changes in /etc after apt run Package changes: -git 1:2.17.1-1ubuntu0.8 amd64 -git-man 1:2.17.1-1ubuntu0.8 all -gitweb 1:2.17.1-1ubuntu0.8 all +git 1:2.17.1-1ubuntu0.9 amd64 +git-man 1:2.17.1-1ubuntu0.9 all +gitweb 1:2.17.1-1ubuntu0.9 all -libmysqlclient20 5.7.35-0ubuntu0.18.04.1 amd64 +libmysqlclient20 5.7.35-0ubuntu0.18.04.2 amd64 -libpam-systemd 237-3ubuntu10.51 amd64 +libpam-systemd 237-3ubuntu10.52 amd64 -libsystemd-dev 237-3ubuntu10.51 amd64 +libsystemd-dev 237-3ubuntu10.52 amd64 -libsystemd0 237-3ubuntu10.51 amd64 -libsystemd0 237-3ubuntu10.51 i386 +libsystemd0 237-3ubuntu10.52 amd64 +libsystemd0 237-3ubuntu10.52 i386 -libudev1 237-3ubuntu10.51 amd64 -libudev1 237-3ubuntu10.51 i386 +libudev1 237-3ubuntu10.52 amd64 +libudev1 237-3ubuntu10.52 i386 -python-apt 1.6.5ubuntu0.6 amd64 -python-apt-common 1.6.5ubuntu0.6 all +python-apt 1.6.5ubuntu0.7 amd64 +python-apt-common 1.6.5ubuntu0.7 all -python3-apport 2.20.9-0ubuntu7.24 all -python3-apt 1.6.5ubuntu0.6 amd64 +python3-apport 2.20.9-0ubuntu7.26 all +python3-apt 1.6.5ubuntu0.7 amd64 -python3-distupgrade 1:18.04.44 all +python3-distupgrade 1:18.04.45 all -python3-problem-report 2.20.9-0ubuntu7.24 all +python3-problem-report 2.20.9-0ubuntu7.26 all -systemd 237-3ubuntu10.51 amd64 -systemd-coredump 237-3ubuntu10.51 amd64 +systemd 237-3ubuntu10.52 amd64 +systemd-coredump 237-3ubuntu10.52 amd64 -systemd-sysv 237-3ubuntu10.51 amd64 +systemd-sysv 237-3ubuntu10.52 amd64 -ubuntu-release-upgrader-core 1:18.04.44 all +ubuntu-release-upgrader-core 1:18.04.45 all -udev 237-3ubuntu10.51 amd64 +udev 237-3ubuntu10.52 amd64 -update-notifier-common 3.192.1.11 all +update-notifier-common 3.192.1.12 all -wireless-regdb 2021.07.14-0ubuntu1~18.04.1 all +wireless-regdb 2021.08.28-0ubuntu1~18.04.1 all --- diff --git a/.etckeeper b/.etckeeper index a9420241..e52e77f6 100755 --- a/.etckeeper +++ b/.etckeeper @@ -6643,6 +6643,7 @@ maybe chmod 0644 'letsencrypt/csr/2922_csr-certbot.pem' maybe chmod 0644 'letsencrypt/csr/2923_csr-certbot.pem' maybe chmod 0644 'letsencrypt/csr/2924_csr-certbot.pem' maybe chmod 0644 'letsencrypt/csr/2925_csr-certbot.pem' +maybe chmod 0644 'letsencrypt/csr/2926_csr-certbot.pem' maybe chmod 0700 'letsencrypt/keys' maybe chmod 0600 'letsencrypt/keys/0000_key-certbot.pem' maybe chmod 0600 'letsencrypt/keys/0001_key-certbot.pem' @@ -9571,6 +9572,7 @@ maybe chmod 0600 'letsencrypt/keys/2923_key-certbot.pem' maybe chmod 0600 'letsencrypt/keys/2924_key-certbot.pem' maybe chmod 0600 'letsencrypt/keys/2925_key-certbot.pem' maybe chmod 0600 'letsencrypt/keys/2926_key-certbot.pem' +maybe chmod 0600 'letsencrypt/keys/2927_key-certbot.pem' maybe chmod 0755 'letsencrypt/live' maybe chmod 0755 'letsencrypt/live/ccu.hoellein.online' maybe chmod 0644 'letsencrypt/live/ccu.hoellein.online/README' diff --git a/cron.weekly/update-notifier-common b/cron.weekly/update-notifier-common index 07b890c7..0e871079 100755 --- a/cron.weekly/update-notifier-common +++ b/cron.weekly/update-notifier-common @@ -4,5 +4,12 @@ set -e [ -x /usr/lib/ubuntu-release-upgrader/release-upgrade-motd ] || exit 0 -# Check to see whether there is a new version of Ubuntu available -/usr/lib/ubuntu-release-upgrader/release-upgrade-motd +sleep_then_check() { + # Sleep for up to an hour to spread the load of checking for updates on + # the Ubuntu infrastructure + sleep $(shuf -i 1-3600 -n 1) + # Check to see whether there is a new version of Ubuntu available + /usr/lib/ubuntu-release-upgrader/release-upgrade-motd +} + +sleep_then_check & diff --git a/dhcp/dhclient-enter-hooks.d/resolved b/dhcp/dhclient-enter-hooks.d/resolved index e3c7ed73..870ea76e 100755 --- a/dhcp/dhclient-enter-hooks.d/resolved +++ b/dhcp/dhclient-enter-hooks.d/resolved @@ -14,7 +14,7 @@ # (D) = master script downs interface # (-) = master script does nothing with this -if [ -x /lib/systemd/systemd-resolved ] ; then +if systemctl is-enabled systemd-resolved > /dev/null 2>&1; then # For safety, first undefine the nasty default make_resolv_conf() make_resolv_conf() { : ; } case "$reason" in @@ -57,6 +57,10 @@ EOF newstate="$(mktemp)" md5sum $statedir/isc-dhcp-v4-$interface.conf $statedir/isc-dhcp-v6-$interface.conf > $newstate 2> /dev/null if ! cmp --quiet $oldstate $newstate; then + # We need to reset-failed to reset the start limit counter, + # in case we're processing more than StartLimitBurst interfaces + # LP: #1939255 + systemctl reset-failed systemd-resolved.service systemctl try-reload-or-restart systemd-resolved.service fi diff --git a/letsencrypt/csr/2926_csr-certbot.pem b/letsencrypt/csr/2926_csr-certbot.pem new file mode 100644 index 00000000..84a72396 --- /dev/null +++ b/letsencrypt/csr/2926_csr-certbot.pem @@ -0,0 +1,16 @@ +-----BEGIN CERTIFICATE REQUEST----- +MIICdTCCAV0CAQIwADCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKlG +b+LCJy7ahentNXQx1CgYhV1mPqy49CX6Qy0rZpv/OAyvnzNrZXQM9oryLmGO6BpJ +QvLEDuappLl84MJ3/r1SsG/hR62hjCkBKE5cuLSp2Jnb7o5schTjYXl7zxZoSAWU +tGKTxNrwwOvbJnifNKPSkn64WZUcsuLlWIv6zW2cqpy4iQKVI96SDt4zvoOYVbpp +5ez+FsRJywa+q53/YKFMwRgU6zBqQvf5zniHWdytxK3SvxLykzgjtJ0AfMkbTXsp +4dQn9WQvL2zb74Ud8ZKXD7Y8QehQZDSsfcJqfJy8PtLhzVntZx7wKRvJodsK6uLf +z35ZGO5Al1wBhoSyL+8CAwEAAaAwMC4GCSqGSIb3DQEJDjEhMB8wHQYDVR0RBBYw +FIISdHYuaG9lbGxlaW4ub25saW5lMA0GCSqGSIb3DQEBCwUAA4IBAQA6DSe/HAJ5 +Q41rZgfetUeXkOC3FngbSAYlISWZON96i26Zkrh92uow2mR+zd6PJ1VWLPWFLsnx +kAYXLpsDXeMXj8t0rfLMq/s5nbKW1da9feD3iAI4M9eH3gCGWwgPBQ1yAIjlo0DG +nlBPS4eSXAtpiviylTmPpOCPVZWqgRnhtnmFvKRG36ofkkUSDkjf/MN80uQkGtOS +AKqbrZIym6idLAt2t6MWKwJwNtbVgtAhMUm1s7qckSb3Tl1ieZ2gRqn3WeR2Eo9R +LCcTn5/Fz/j6jZ5JBs7dxwOCx0tQHw99eIPeYaeDjoiSIfOqWehH7HeeRMT4km6D +qxmwPqWzzwaB +-----END CERTIFICATE REQUEST----- diff --git a/letsencrypt/keys/2927_key-certbot.pem b/letsencrypt/keys/2927_key-certbot.pem new file mode 100644 index 00000000..beadd193 --- /dev/null +++ b/letsencrypt/keys/2927_key-certbot.pem @@ -0,0 +1,28 @@ +-----BEGIN PRIVATE KEY----- +MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCpRm/iwicu2oXp +7TV0MdQoGIVdZj6suPQl+kMtK2ab/zgMr58za2V0DPaK8i5hjugaSULyxA7mqaS5 +fODCd/69UrBv4UetoYwpAShOXLi0qdiZ2+6ObHIU42F5e88WaEgFlLRik8Ta8MDr +2yZ4nzSj0pJ+uFmVHLLi5ViL+s1tnKqcuIkClSPekg7eM76DmFW6aeXs/hbEScsG +vqud/2ChTMEYFOswakL3+c54h1ncrcSt0r8S8pM4I7SdAHzJG017KeHUJ/VkLy9s +2++FHfGSlw+2PEHoUGQ0rH3CanycvD7S4c1Z7Wce8CkbyaHbCuri389+WRjuQJdc +AYaEsi/vAgMBAAECggEAVcvGr9caRwwpLay2GCOdVYlAJ1vIToEb9hfHbqB9zHlq +LjvhZA1+CXj8iOZBDd+B0rjpPuSSbOT1AbLCtK5fJhRAKySy0NV9ldbpV/Z1A9TG +XQ109ykOFXo+EHXpO4E1Z+a8Gu6sqw+1qJWWBTMkWhhDegj0FrjKDmiSHbjL4E7h +v8NmXla4t3jSRfYjcmnN9/FxUrek730jSXyBfzAQr/G8Jy1z9BtNcuLCHQCVcawo +4iOnB7HM8ZBmjzko/e+yOoS8/PQ4yAhzT/WwnHlzltBQMvSgzkHVd2zni858ZFcY +dzidWWwkM5WXGgtUBb8vZ9UJrB6aTSJuAF8DJkHpmQKBgQDRrTk+8cYaFMYjHbcA +d57L/UDxFMux9FJ/nByPmn7x1oj3+kQFmmhwpg0uTrcGNzV+bpTAXdBGbP0nZ/73 +zskzOGFx9VVfCViCf6PQ8XWyejEpirR5c+iMuFMvFjDmHiTqmXRrYJoyBzIqjJvN +optBGWdmecYo24dRHGVttbdXfQKBgQDOrDUISBbxcsoM0ulKdlH+r3BEK53WnIOh +lxqHopk6EbAnx+z411geflhkJNRqaRrQ+Ai1SfqFDw2sOu9IhDcE7ynTPOA++Nnu +z0sW5ElKD2ekCPtRp13NQbZAsdXX+zkq6bTeE+rxlRqqHh2TGrONVzhK69Us4fDu +vPpNUEM42wKBgAT2U4eA005ktXe5SU5yhkiPmszZ0CRLAvTQLgDcCCsTB7TOsHNt +fxFDbMZuyHgWMGbomQ6gacBw7eDT3j3hH/PdXrkCtF2GbBjSin70Z/OsXqN8C99f +9d32sslHfirEBd2jehTceWm7r90/7KQGOCRnRIIxWZY389DgminphghFAoGANpDC +46/c1tyeueoJjA5XMa3yLx1w69Og8U3qxDrKx8kZwDcJut1oN4zWG4KZzop3eQqz +ieHBUdYanwlkWboGqLfYTBw7fITJTULPqXiWXQZaL7XrXLCalHGwA76wHfkHK+xO +Q3/wvN3ID3gqCMe49i08AJPpUZNJwE6Gq1jwlpcCgYEAquWQ8yZlSGfMjlpGRvSW +E+HMC6dVe7CnD7TRM1Mfj3jkWB8tPbZno5sdN0tdeH0Debr8Spmvko+BMairymYB +J2XrGGeeRs531b9L7PYpbuqvZ6aqX21O4DvGWxWST2Qsws3ykB35ZOYloBC3SH/0 +KLCOL9IOt8wy1l1apeNYLFQ= +-----END PRIVATE KEY-----