]> git.hoellein.online Git - homeserver/commitdiff
committing changes in /etc after apt run
authormhoellein <mhoellein@freenet.de>
Thu, 20 Apr 2023 12:59:07 +0000 (14:59 +0200)
committermhoellein <mhoellein@freenet.de>
Thu, 20 Apr 2023 12:59:07 +0000 (14:59 +0200)
Package changes:
-apt 1.6.14 amd64
+apt 1.6.17 amd64
-apt-transport-https 1.6.14 all
-apt-utils 1.6.14 amd64
+apt-transport-https 1.6.17 all
+apt-utils 1.6.17 amd64
-chromium-codecs-ffmpeg-extra 111.0.5563.64-0ubuntu0.18.04.5 amd64
+chromium-codecs-ffmpeg-extra 112.0.5615.49-0ubuntu0.18.04.1 amd64
-code-brand 22.05-28 all
-collaboraoffice 22.05.12-3 amd64
-collaboraoffice-ure 22.05.12-3 amd64
+code-brand 22.05-31 all
+collaboraoffice 22.05.13-1 amd64
+collaboraoffice-ure 22.05.13-1 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
+collaboraofficebasis-calc 22.05.13-1 amd64
+collaboraofficebasis-core 22.05.13-1 amd64
+collaboraofficebasis-draw 22.05.13-1 amd64
+collaboraofficebasis-en-us 22.05.13-1 amd64
+collaboraofficebasis-extension-pdf-import 22.05.13-1 amd64
+collaboraofficebasis-graphicfilter 22.05.13-1 amd64
+collaboraofficebasis-images 22.05.13-1 amd64
+collaboraofficebasis-impress 22.05.13-1 amd64
+collaboraofficebasis-math 22.05.13-1 amd64
+collaboraofficebasis-ooofonts 22.05.13-1 amd64
+collaboraofficebasis-ooolinguistic 22.05.13-1 amd64
+collaboraofficebasis-writer 22.05.13-1 amd64
-coolwsd 22.05.12.4-1 amd64
+coolwsd 22.05.13.1-1 amd64
-dnsmasq-base 2.79-1ubuntu0.6 amd64
+dnsmasq-base 2.79-1ubuntu0.7 amd64
-firefox 111.0.1+linuxmint1+tricia amd64
-firefox-locale-de 111.0.1+linuxmint1+tricia amd64
-firefox-locale-en 111.0.1+linuxmint1+tricia amd64
+firefox 112.0.1+linuxmint1+tricia amd64
+firefox-locale-de 112.0.1+linuxmint1+tricia amd64
+firefox-locale-en 112.0.1+linuxmint1+tricia amd64
-fonts-opensymbol 2:102.10+LibO6.0.7-0ubuntu0.18.04.12 all
+fonts-opensymbol 2:102.10+LibO6.0.7-0ubuntu0.18.04.13 all
-ghostscript 9.26~dfsg+0-0ubuntu0.18.04.17 amd64
-ghostscript-x 9.26~dfsg+0-0ubuntu0.18.04.17 amd64
+ghostscript 9.26~dfsg+0-0ubuntu0.18.04.18 amd64
+ghostscript-x 9.26~dfsg+0-0ubuntu0.18.04.18 amd64
-libapt-inst2.0 1.6.14 amd64
+libapt-inst2.0 1.6.17 amd64
-libapt-pkg5.0 1.6.14 amd64
+libapt-pkg5.0 1.6.17 amd64
-libgs9 9.26~dfsg+0-0ubuntu0.18.04.17 amd64
-libgs9-common 9.26~dfsg+0-0ubuntu0.18.04.17 all
+libgs9 9.26~dfsg+0-0ubuntu0.18.04.18 amd64
+libgs9-common 9.26~dfsg+0-0ubuntu0.18.04.18 all
-libreoffice-avmedia-backend-gstreamer 1:6.0.7-0ubuntu0.18.04.12 amd64
-libreoffice-base 1:6.0.7-0ubuntu0.18.04.12 amd64
-libreoffice-base-core 1:6.0.7-0ubuntu0.18.04.12 amd64
-libreoffice-base-drivers 1:6.0.7-0ubuntu0.18.04.12 amd64
-libreoffice-calc 1:6.0.7-0ubuntu0.18.04.12 amd64
-libreoffice-common 1:6.0.7-0ubuntu0.18.04.12 all
-libreoffice-core 1:6.0.7-0ubuntu0.18.04.12 amd64
-libreoffice-draw 1:6.0.7-0ubuntu0.18.04.12 amd64
+libreoffice-avmedia-backend-gstreamer 1:6.0.7-0ubuntu0.18.04.13 amd64
+libreoffice-base 1:6.0.7-0ubuntu0.18.04.13 amd64
+libreoffice-base-core 1:6.0.7-0ubuntu0.18.04.13 amd64
+libreoffice-base-drivers 1:6.0.7-0ubuntu0.18.04.13 amd64
+libreoffice-calc 1:6.0.7-0ubuntu0.18.04.13 amd64
+libreoffice-common 1:6.0.7-0ubuntu0.18.04.13 all
+libreoffice-core 1:6.0.7-0ubuntu0.18.04.13 amd64
+libreoffice-draw 1:6.0.7-0ubuntu0.18.04.13 amd64
-libreoffice-gnome 1:6.0.7-0ubuntu0.18.04.12 amd64
-libreoffice-gtk 1:6.0.7-0ubuntu0.18.04.12 all
-libreoffice-gtk2 1:6.0.7-0ubuntu0.18.04.12 amd64
-libreoffice-gtk3 1:6.0.7-0ubuntu0.18.04.12 amd64
+libreoffice-gnome 1:6.0.7-0ubuntu0.18.04.13 amd64
+libreoffice-gtk 1:6.0.7-0ubuntu0.18.04.13 all
+libreoffice-gtk2 1:6.0.7-0ubuntu0.18.04.13 amd64
+libreoffice-gtk3 1:6.0.7-0ubuntu0.18.04.13 amd64
-libreoffice-impress 1:6.0.7-0ubuntu0.18.04.12 amd64
-libreoffice-java-common 1:6.0.7-0ubuntu0.18.04.12 all
-libreoffice-math 1:6.0.7-0ubuntu0.18.04.12 amd64
-libreoffice-ogltrans 1:6.0.7-0ubuntu0.18.04.12 amd64
-libreoffice-pdfimport 1:6.0.7-0ubuntu0.18.04.12 all
+libreoffice-impress 1:6.0.7-0ubuntu0.18.04.13 amd64
+libreoffice-java-common 1:6.0.7-0ubuntu0.18.04.13 all
+libreoffice-math 1:6.0.7-0ubuntu0.18.04.13 amd64
+libreoffice-ogltrans 1:6.0.7-0ubuntu0.18.04.13 amd64
+libreoffice-pdfimport 1:6.0.7-0ubuntu0.18.04.13 all
-libreoffice-sdbc-firebird 1:6.0.7-0ubuntu0.18.04.12 amd64
-libreoffice-sdbc-hsqldb 1:6.0.7-0ubuntu0.18.04.12 amd64
-libreoffice-style-galaxy 1:6.0.7-0ubuntu0.18.04.12 all
+libreoffice-sdbc-firebird 1:6.0.7-0ubuntu0.18.04.13 amd64
+libreoffice-sdbc-hsqldb 1:6.0.7-0ubuntu0.18.04.13 amd64
+libreoffice-style-galaxy 1:6.0.7-0ubuntu0.18.04.13 all
-libreoffice-style-tango 1:6.0.7-0ubuntu0.18.04.12 all
-libreoffice-writer 1:6.0.7-0ubuntu0.18.04.12 amd64
+libreoffice-style-tango 1:6.0.7-0ubuntu0.18.04.13 all
+libreoffice-writer 1:6.0.7-0ubuntu0.18.04.13 amd64
-libxml2 2.9.4+dfsg1-6.1ubuntu1.8 amd64
-libxml2 2.9.4+dfsg1-6.1ubuntu1.8 i386
-libxml2-utils 2.9.4+dfsg1-6.1ubuntu1.8 amd64
+libxml2 2.9.4+dfsg1-6.1ubuntu1.9 amd64
+libxml2 2.9.4+dfsg1-6.1ubuntu1.9 i386
+libxml2-utils 2.9.4+dfsg1-6.1ubuntu1.9 amd64
-linux-libc-dev 4.15.0-208.220 amd64
+linux-libc-dev 4.15.0-209.220 amd64
-python-libxml2 2.9.4+dfsg1-6.1ubuntu1.8 amd64
+python-libxml2 2.9.4+dfsg1-6.1ubuntu1.9 amd64
-python3-apport 2.20.9-0ubuntu7.28 all
+python3-apport 2.20.9-0ubuntu7.29 all
-python3-problem-report 2.20.9-0ubuntu7.28 all
+python3-problem-report 2.20.9-0ubuntu7.29 all
-python3-uno 1:6.0.7-0ubuntu0.18.04.12 amd64
+python3-uno 1:6.0.7-0ubuntu0.18.04.13 amd64
-sudo 1.8.21p2-3ubuntu1.5 amd64
+sudo 1.8.21p2-3ubuntu1.6 amd64
-thunderbird 1:102.9.0+build1-0ubuntu0.18.04.1 amd64
-thunderbird-gnome-support 1:102.9.0+build1-0ubuntu0.18.04.1 amd64
-thunderbird-locale-en 1:102.9.0+build1-0ubuntu0.18.04.1 amd64
-thunderbird-locale-en-us 1:102.9.0+build1-0ubuntu0.18.04.1 all
+thunderbird 1:102.10.0+build2-0ubuntu0.18.04.1 amd64
+thunderbird-gnome-support 1:102.10.0+build2-0ubuntu0.18.04.1 amd64
+thunderbird-locale-en 1:102.10.0+build2-0ubuntu0.18.04.1 amd64
+thunderbird-locale-en-us 1:102.10.0+build2-0ubuntu0.18.04.1 all
-tzdata 2022g-0ubuntu0.18.04 all
-ubuntu-advantage-tools 27.13.6~18.04.1 amd64
+tzdata 2023c-0ubuntu0.18.04 all
+ubuntu-advantage-tools 27.14.4~18.04 amd64
-uno-libs3 6.0.7-0ubuntu0.18.04.12 amd64
+uno-libs3 6.0.7-0ubuntu0.18.04.13 amd64
-ure 6.0.7-0ubuntu0.18.04.12 amd64
+ure 6.0.7-0ubuntu0.18.04.13 amd64
-vim 2:8.0.1453-1ubuntu1.12 amd64
-vim-common 2:8.0.1453-1ubuntu1.12 all
+vim 2:8.0.1453-1ubuntu1.13 amd64
+vim-common 2:8.0.1453-1ubuntu1.13 all
-vim-runtime 2:8.0.1453-1ubuntu1.12 all
-vim-tiny 2:8.0.1453-1ubuntu1.12 amd64
+vim-runtime 2:8.0.1453-1ubuntu1.13 all
+vim-tiny 2:8.0.1453-1ubuntu1.13 amd64
-xxd 2:8.0.1453-1ubuntu1.12 amd64
+xxd 2:8.0.1453-1ubuntu1.13 amd64

.etckeeper
apt/apt.conf.d/01autoremove-kernels [deleted file]
apt/apt.conf.d/20apt-esm-hook.conf
kernel/postinst.d/apt-auto-removal [deleted file]
letsencrypt/csr/3969_csr-certbot.pem [new file with mode: 0644]
letsencrypt/keys/3970_key-certbot.pem [new file with mode: 0644]
ubuntu-advantage/uaclient.conf
update-motd.d/88-esm-announce [deleted file]
update-motd.d/91-contract-ua-esm-status

index e238b65520521962b48cf51c56248b26225c5bce..dd59bc709f9ed1a8d8e415786561003b35696775 100755 (executable)
@@ -788,7 +788,6 @@ maybe chmod 0644 'apt/apt.conf.d/00recommends'
 maybe chmod 0664 'apt/apt.conf.d/00trustcdrom'
 maybe chmod 0644 'apt/apt.conf.d/01-vendor-ubuntu'
 maybe chmod 0644 'apt/apt.conf.d/01autoremove'
-maybe chmod 0444 'apt/apt.conf.d/01autoremove-kernels'
 maybe chmod 0644 'apt/apt.conf.d/05etckeeper'
 maybe chmod 0644 'apt/apt.conf.d/10periodic'
 maybe chmod 0644 'apt/apt.conf.d/15update-stamp'
@@ -3699,7 +3698,6 @@ maybe chmod 0755 'kernel/header_postinst.d'
 maybe chmod 0755 'kernel/header_postinst.d/dkms'
 maybe chmod 0755 'kernel/install.d'
 maybe chmod 0755 'kernel/postinst.d'
-maybe chmod 0755 'kernel/postinst.d/apt-auto-removal'
 maybe chmod 0755 'kernel/postinst.d/dkms'
 maybe chmod 0755 'kernel/postinst.d/initramfs-tools'
 maybe chmod 0755 'kernel/postinst.d/pm-utils'
@@ -8424,6 +8422,7 @@ maybe chmod 0644 'letsencrypt/csr/3965_csr-certbot.pem'
 maybe chmod 0644 'letsencrypt/csr/3966_csr-certbot.pem'
 maybe chmod 0644 'letsencrypt/csr/3967_csr-certbot.pem'
 maybe chmod 0644 'letsencrypt/csr/3968_csr-certbot.pem'
+maybe chmod 0644 'letsencrypt/csr/3969_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'
@@ -12395,6 +12394,7 @@ maybe chmod 0600 'letsencrypt/keys/3966_key-certbot.pem'
 maybe chmod 0600 'letsencrypt/keys/3967_key-certbot.pem'
 maybe chmod 0600 'letsencrypt/keys/3968_key-certbot.pem'
 maybe chmod 0600 'letsencrypt/keys/3969_key-certbot.pem'
+maybe chmod 0600 'letsencrypt/keys/3970_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'
@@ -13984,7 +13984,6 @@ maybe chmod 0755 'update-motd.d/10-help-text'
 maybe chmod 0755 'update-motd.d/50-motd-news'
 maybe chmod 0755 'update-motd.d/80-esm'
 maybe chmod 0755 'update-motd.d/80-livepatch'
-maybe chmod 0755 'update-motd.d/88-esm-announce'
 maybe chmod 0755 'update-motd.d/90-updates-available'
 maybe chmod 0755 'update-motd.d/91-contract-ua-esm-status'
 maybe chmod 0755 'update-motd.d/91-release-upgrade'
diff --git a/apt/apt.conf.d/01autoremove-kernels b/apt/apt.conf.d/01autoremove-kernels
deleted file mode 100644 (file)
index 57033ba..0000000
+++ /dev/null
@@ -1,65 +0,0 @@
-// DO NOT EDIT! File autogenerated by /etc/kernel/postinst.d/apt-auto-removal
-APT::NeverAutoRemove
-{
-   "^linux-image-5\.0\.0-32-generic$";
-   "^linux-image-5\.4\.0-146-generic$";
-   "^linux-headers-5\.0\.0-32-generic$";
-   "^linux-headers-5\.4\.0-146-generic$";
-   "^linux-image-extra-5\.0\.0-32-generic$";
-   "^linux-image-extra-5\.4\.0-146-generic$";
-   "^linux-modules-5\.0\.0-32-generic$";
-   "^linux-modules-5\.4\.0-146-generic$";
-   "^linux-modules-extra-5\.0\.0-32-generic$";
-   "^linux-modules-extra-5\.4\.0-146-generic$";
-   "^linux-signed-image-5\.0\.0-32-generic$";
-   "^linux-signed-image-5\.4\.0-146-generic$";
-   "^linux-image-unsigned-5\.0\.0-32-generic$";
-   "^linux-image-unsigned-5\.4\.0-146-generic$";
-   "^kfreebsd-image-5\.0\.0-32-generic$";
-   "^kfreebsd-image-5\.4\.0-146-generic$";
-   "^kfreebsd-headers-5\.0\.0-32-generic$";
-   "^kfreebsd-headers-5\.4\.0-146-generic$";
-   "^gnumach-image-5\.0\.0-32-generic$";
-   "^gnumach-image-5\.4\.0-146-generic$";
-   "^.*-modules-5\.0\.0-32-generic$";
-   "^.*-modules-5\.4\.0-146-generic$";
-   "^.*-kernel-5\.0\.0-32-generic$";
-   "^.*-kernel-5\.4\.0-146-generic$";
-   "^linux-backports-modules-.*-5\.0\.0-32-generic$";
-   "^linux-backports-modules-.*-5\.4\.0-146-generic$";
-   "^linux-modules-.*-5\.0\.0-32-generic$";
-   "^linux-modules-.*-5\.4\.0-146-generic$";
-   "^linux-tools-5\.0\.0-32-generic$";
-   "^linux-tools-5\.4\.0-146-generic$";
-   "^linux-cloud-tools-5\.0\.0-32-generic$";
-   "^linux-cloud-tools-5\.4\.0-146-generic$";
-   "^linux-buildinfo-5\.0\.0-32-generic$";
-   "^linux-buildinfo-5\.4\.0-146-generic$";
-   "^linux-source-5\.0\.0-32-generic$";
-   "^linux-source-5\.4\.0-146-generic$";
-};
-/* Debug information:
-# dpkg list:
-ii  linux-image-4.15.0-20-generic                4.15.0-20.21                                             amd64        Signed kernel image generic
-ii  linux-image-5.0.0-32-generic                 5.0.0-32.34~18.04.2                                      amd64        Signed kernel image generic
-iF  linux-image-5.4.0-146-generic                5.4.0-146.163~18.04.1                                    amd64        Signed kernel image generic
-ii  linux-image-generic-hwe-18.04                5.4.0.146.163~18.04.117                                  amd64        Generic Linux kernel image
-# list of installed kernel packages:
-4.15.0-20-generic 4.15.0-20.21
-5.0.0-32-generic 5.0.0-32.34~18.04.2
-5.4.0-146-generic 5.4.0-146.163~18.04.1
-# list of different kernel versions:
-5.4.0-146.163~18.04.1
-5.0.0-32.34~18.04.2
-4.15.0-20.21
-# Installing kernel: 5.4.0-146.163~18.04.1 (5.4.0-146-generic)
-# Running kernel: 5.0.0-32.34~18.04.2 (5.0.0-32-generic)
-# Last kernel: 5.4.0-146.163~18.04.1
-# Previous kernel: 5.0.0-32.34~18.04.2
-# Kernel versions list to keep:
-5.0.0-32.34~18.04.2
-5.4.0-146.163~18.04.1
-# Kernel packages (version part) to protect:
-5\.0\.0-32-generic
-5\.4\.0-146-generic
-*/
index 7bcae444bbdc50d38c39f429757e0d09f0af62ac..36a75937c2fb3494978a0dc19eb26921ea8e81ce 100644 (file)
@@ -2,10 +2,6 @@ APT::Update::Pre-Invoke {
        "[ ! -e /run/systemd/system ] || [ $(id -u) -ne 0 ] || systemctl start --no-block apt-news.service esm-cache.service || true";
 };
 
-APT::Update::Post-Invoke-Stats {
-       "[ ! -f /usr/lib/ubuntu-advantage/apt-esm-hook ] || /usr/lib/ubuntu-advantage/apt-esm-hook || true";
-};
-
 binary::apt::AptCli::Hooks::Upgrade {
        "[ ! -f /usr/lib/ubuntu-advantage/apt-esm-json-hook ] || /usr/lib/ubuntu-advantage/apt-esm-json-hook || true";
 };
diff --git a/kernel/postinst.d/apt-auto-removal b/kernel/postinst.d/apt-auto-removal
deleted file mode 100755 (executable)
index 2c32b0c..0000000
+++ /dev/null
@@ -1,83 +0,0 @@
-#!/bin/sh
-set -e
-# Mark as not-for-autoremoval those kernel packages that are:
-#  - the currently booted version
-#  - the kernel version we've been called for
-#  - the latest kernel version (as determined by debian version number)
-#  - the second-latest kernel version
-#
-# In the common case this results in two kernels saved (booted into the
-# second-latest kernel, we install the latest kernel in an upgrade), but
-# can save up to four. Kernel refers here to a distinct release, which can
-# potentially be installed in multiple flavours counting as one kernel.
-
-eval $(apt-config shell APT_CONF_D Dir::Etc::parts/d)
-test -n "${APT_CONF_D}" || APT_CONF_D="/etc/apt/apt.conf.d"
-config_file="${APT_CONF_D}/01autoremove-kernels"
-
-eval $(apt-config shell DPKG Dir::bin::dpkg/f)
-test -n "$DPKG" || DPKG="/usr/bin/dpkg"
-
-list="$("${DPKG}" -l | awk '/^[ih][^nc][ ]+(linux|kfreebsd|gnumach)-image-[0-9]+\./ && $2 !~ /-dbg(:.*)?$/ && $2 !~ /-dbgsym(:.*)?$/ { print $2,$3; }' \
-   | sed -e 's#^\(linux\|kfreebsd\|gnumach\)-image-##' -e 's#:[^:]\+ # #')"
-debverlist="$(echo "$list" | cut -d' ' -f 2 | sort --unique --reverse --version-sort)"
-
-if [ -n "$1" ]; then
-       installed_version="$(echo "$list" | awk "\$1 == \"$1\" { print \$2;exit; }")"
-fi
-unamer="$(uname -r | tr '[A-Z]' '[a-z]')"
-if [ -n "$unamer" ]; then
-       running_version="$(echo "$list" | awk "\$1 == \"$unamer\" { print \$2;exit; }")"
-fi
-# ignore the currently running version if attempting a reproducible build
-if [ -n "${SOURCE_DATE_EPOCH}" ]; then
-       unamer=""
-       running_version=""
-fi
-latest_version="$(echo "$debverlist" | sed -n 1p)"
-previous_version="$(echo "$debverlist" | sed -n 2p)"
-
-debkernels="$(echo "$latest_version
-$installed_version
-$running_version
-$previous_version" | sort -u | sed -e '/^$/ d')"
-kernels="$( (echo "$1
-$unamer"; for deb in $debkernels; do echo "$list" | awk "\$2 == \"$deb\" { print \$1; }"; done; ) \
-   | sed -e 's#\([\.\+]\)#\\\1#g' -e '/^$/ d' | sort -u)"
-
-generateconfig() {
-       cat <<EOF
-// DO NOT EDIT! File autogenerated by $0
-APT::NeverAutoRemove
-{
-EOF
-       for package in $(apt-config dump --no-empty --format '%v%n' 'APT::VersionedKernelPackages'); do
-               for kernel in $kernels; do
-                       echo "   \"^${package}-${kernel}$\";"
-               done
-       done
-       echo '};'
-       if [ "${APT_AUTO_REMOVAL_KERNELS_DEBUG:-true}" = 'true' ]; then
-               cat <<EOF
-/* Debug information:
-# dpkg list:
-$(dpkg -l | grep '\(linux\|kfreebsd\|gnumach\)-image-')
-# list of installed kernel packages:
-$list
-# list of different kernel versions:
-$debverlist
-# Installing kernel: $installed_version ($1)
-# Running kernel: ${running_version:-ignored} (${unamer:-ignored})
-# Last kernel: $latest_version
-# Previous kernel: $previous_version
-# Kernel versions list to keep:
-$debkernels
-# Kernel packages (version part) to protect:
-$kernels
-*/
-EOF
-       fi
-}
-generateconfig "$@" > "${config_file}.dpkg-new"
-mv -f "${config_file}.dpkg-new" "$config_file"
-chmod 444 "$config_file"
diff --git a/letsencrypt/csr/3969_csr-certbot.pem b/letsencrypt/csr/3969_csr-certbot.pem
new file mode 100644 (file)
index 0000000..1b5097e
--- /dev/null
@@ -0,0 +1,16 @@
+-----BEGIN CERTIFICATE REQUEST-----
+MIICdTCCAV0CAQIwADCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANXr
+JUyeTVgVAcsWT6rPtVb7bJjXcauImEI6uvn3uJl8Nleo78zfdou/MMcRHwTcSRWZ
+TgIBrDeTDHt218httpj2OHxWZ+9zV3rR95X1NB458gGONMgn2b9/yE1ks8rzoC1X
+Cv+QaYfxns9qzGGUql4wqbSWZRpq029aKqgKH23AJnUJGMZg0kkI6WSMlt33p8e1
+0B7dSalJ5bDJLmZ+MMDRyQklEJy2Pb7uR6iSuy7VAPyGB5oeS8++uB1xDO6SAs+s
+yiQwQQZvuaRfjelXmACZmVAA6A7UcSTMNwzimJUr+mXmucCWiwxYkBqiWv7R8SmV
+qSeRzItV/tBEgmWyH3ECAwEAAaAwMC4GCSqGSIb3DQEJDjEhMB8wHQYDVR0RBBYw
+FIISdHYuaG9lbGxlaW4ub25saW5lMA0GCSqGSIb3DQEBCwUAA4IBAQAWRxJRInSn
+vQog5A9W+f/+easYjHWIjcw7nE4I5qJbGTDI+y6c6JA5UWDQMwEhkHfkyBIhducz
+YhiuZbVcyNwGOTJIdiO561kyn+D5R/uR1gDlTD2RFN0URxXkHzurz6mKc5LZ7h1L
+2GIsctiGrZrDMcokTGWvFWsT/33czaN9/Tl5JpFUQXbJuWp+OChhPmK8sN+REKGD
+YUYqkWmn36XlBlQyklS3O/8eCScA94oG9uKIEtjiReR0xVaGY5eqkdSOxfXobt13
+kCbBKgkk0w11fFW/rMgjZdyw7qKKaiCUYrwzm+OdnULFiQzmssbtdYpO6koxf2T2
+Y6/P85AkXpx8
+-----END CERTIFICATE REQUEST-----
diff --git a/letsencrypt/keys/3970_key-certbot.pem b/letsencrypt/keys/3970_key-certbot.pem
new file mode 100644 (file)
index 0000000..8d8cd98
--- /dev/null
@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQDV6yVMnk1YFQHL
+Fk+qz7VW+2yY13GriJhCOrr597iZfDZXqO/M33aLvzDHER8E3EkVmU4CAaw3kwx7
+dtfIbbaY9jh8Vmfvc1d60feV9TQeOfIBjjTIJ9m/f8hNZLPK86AtVwr/kGmH8Z7P
+asxhlKpeMKm0lmUaatNvWiqoCh9twCZ1CRjGYNJJCOlkjJbd96fHtdAe3UmpSeWw
+yS5mfjDA0ckJJRCctj2+7keokrsu1QD8hgeaHkvPvrgdcQzukgLPrMokMEEGb7mk
+X43pV5gAmZlQAOgO1HEkzDcM4piVK/pl5rnAlosMWJAaolr+0fEplaknkcyLVf7Q
+RIJlsh9xAgMBAAECggEAQ8ngaAdCO0ds6g6H8Hkh3g6Ou2CKhPEkTtiNp+j4dqsG
+DYFbfHDUADT2IB8s1T15a37JWZluGa5fpkBi4QDjfFWKUNyQ0zCZ6DHhY4PwoCN8
+rUGDOGpodmbn8p6W2xmZCMUslxAMYSgQS2psmf+ifXauUKvYHib8Ga1ZFyceDojh
+SxG27X9d4gg+WdOm9Ohs5iKlqaEa3CRGcxlXnEOtzzvDtZIdntx6LNCFXN+Vr4Yy
+Y5+Rcrm7Yqj/31GKZmOHL+0k2YKUgkUC0FeZxcJhbz0IfH+um47vONFncJc2n6gF
+j+dA9StXF18s0IGf0qied8Je4dJUG6llCZH0KdmAgQKBgQDvsXZymUGfjIEo3ocv
+71/jZUa+9lhukWUhUiuw9DgXlYAg9egqqY0ER77OLVK8VrwUBuIQVc7i7BmW9J2o
+qN33VSBrN3pnO3brE2MBv98itHuiSVRLrgGLvMQt6qmWNWz2oFIfcs/cs5rng7yS
+rf/Odk74dxkz1zRzMDfDekOevwKBgQDkeMl0FybybGF8QfQJV1PmIMNVpEs12fmk
+IXpAby0fpExLjzi3lu6JbMw+Jfy1ryAAj6Z3og1ctKatFnddRYgX3IQ5w5h9CWAX
+RuXwYraxbnQOxeIemzuwD0WRMgR1Rbqchk9dmiX8zzJdczgFmbDKVpHAanDU4esa
+LvPsVV79zwKBgDGRgI5IdVK6asd55XkbRrgu7Id3SGhtNv3CEXkBuEvgReQLFp0j
+/R6ie6oFo3OBeFmn5r48EJHLA6u9IJGNgoGwoAisK2sH2BrbIoFtHYb+zgaMpZsU
+/Ara2bMpMTL4D3WdR/5q7uOUXPd9vdSTmTAoNUKa1qJq4dTkZtPNCAjfAoGAA/B5
+OME1cLShsazJcmfJEIy8EXv1uAX8IfJZ00aXdpY0opDjn3bAwinYE7I/+zn7yUaw
+zhtDM7gBr7ZVdIxAXnj05rISrQU+XOhiCpUJJWIMKj0LOw/eJZj90BUWspbzMsO2
+Fp0Tzpob+jSEYMRXogWAGds7+s+yaA8rMYX/T00CgYA8g2/sTjLGMHBgageavLrG
+1SYGV3INjrGMuWAkWQYo0EDxt4emhCrJMJy5IKoPWFOhRj9JerVzkZwCJai6erCX
+5xyY2GfxGCMp/PXidlm/dcn81tiF6mSpQRb6s6o3j/kUDKsSG7lCsXiXWG6a3Tty
+Ft9oMutKW3xLSHu0TEGPKw==
+-----END PRIVATE KEY-----
index 3bf107a58ed38c28c9c482b854339bf7e63cdc45..6499bf13c57f4a83d016831dc2f74de10b01b3c6 100644 (file)
@@ -1,18 +1,2 @@
-# Ubuntu Pro Client config file.
-# If you modify this file, run "pro refresh config" to ensure changes are
-# picked up by Ubuntu Pro Client.
-
 contract_url: https://contracts.canonical.com
-data_dir: /var/lib/ubuntu-advantage
-log_file: /var/log/ubuntu-advantage.log
 log_level: debug
-security_url: https://ubuntu.com/security
-timer_log_file: /var/log/ubuntu-advantage-timer.log
-daemon_log_file: /var/log/ubuntu-advantage-daemon.log
-ua_config:
-  apt_http_proxy: null
-  apt_https_proxy: null
-  http_proxy: null
-  https_proxy: null
-  update_messaging_timer: 21600
-  metering_timer: 14400
diff --git a/update-motd.d/88-esm-announce b/update-motd.d/88-esm-announce
deleted file mode 100755 (executable)
index 44b521b..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-stamp="/var/lib/ubuntu-advantage/messages/motd-esm-announce"
-
-[ ! -r "$stamp" ] || cat "$stamp"
index cc823340c157f7b863b6b2da6d653483de19a620..cfc6bb22f007b8340ed2b6b82906e0b61a889178 100755 (executable)
@@ -1,7 +1,7 @@
 #!/bin/sh
-esm_stamp="/var/lib/ubuntu-advantage/messages/motd-esm-service-status"
+contract_status_stamp="/var/lib/ubuntu-advantage/messages/motd-contract-status"
 
-[ ! -r "$esm_stamp" ] || cat "$esm_stamp"
+[ ! -r "$contract_status_stamp" ] || cat "$contract_status_stamp"
 
 auto_attach_stamp="/var/lib/ubuntu-advantage/messages/motd-auto-attach-status"