committing changes in /etc made by "apt-get upgrade"

Package changes:
-isc-dhcp-client 4.4.1-2.1ubuntu5.20.04.3 amd64
-isc-dhcp-common 4.4.1-2.1ubuntu5.20.04.3 amd64
+isc-dhcp-client 4.4.1-2.1ubuntu5.20.04.4 amd64
+isc-dhcp-common 4.4.1-2.1ubuntu5.20.04.4 amd64
-ubuntu-advantage-tools 27.10.1~20.04.1 amd64
+ubuntu-advantage-tools 27.11.2~20.04.1 amd64
-zlib1g 1:1.2.11.dfsg-2ubuntu1.3 amd64
-zlib1g-dev 1:1.2.11.dfsg-2ubuntu1.3 amd64
+zlib1g 1:1.2.11.dfsg-2ubuntu1.4 amd64
+zlib1g-dev 1:1.2.11.dfsg-2ubuntu1.4 amd64

diff --git a/.etckeeper b/.etckeeper
index 2cae98d4b3c1405c2fb26fd3da80efd59f5bea7a..61ae8b7688b6adab6202aba99def2709ce58484b 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -1623,6 +1623,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/letsencrypt/.certbot.lock b/letsencrypt/.certbot.lock
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/ubuntu-advantage/help_data.yaml b/ubuntu-advantage/help_data.yaml
index c3015736d91beab098067c5feafbc069dc6a1192..1b66441f3c38e7f8e1477ede3e1c0c604fedf2ff 100644 (file)
--- a/ubuntu-advantage/help_data.yaml
+++ b/ubuntu-advantage/help_data.yaml
@@ -15,22 +15,21 @@ cis:
 
 esm-apps:
     help: |
-      UA Apps: Extended Security Maintenance is enabled by default on entitled
-      workloads. It provides access to a private PPA which includes available
-      high and critical CVE fixes for Ubuntu LTS packages in the Ubuntu Main
-      and Ubuntu Universe repositories from the Ubuntu LTS release date until
+      Expanded Security Maintenance for Applications is enabled by default
+      on entitled workloads. It provides access to a private PPA which includes
+      available high and critical CVE fixes for Ubuntu LTS packages in the Ubuntu
+      Main and Ubuntu Universe repositories from the Ubuntu LTS release date until
       its end of life. You can find out more about the esm service at
       https://ubuntu.com/security/esm
 
 esm-infra:
    help: |
-     esm-infra provides access to a private ppa which includes available high
-     and critical CVE fixes for Ubuntu LTS packages in the Ubuntu Main
-     repository between the end of the standard Ubuntu LTS security
-     maintenance and its end of life. It is enabled by default with
-     Extended Security Maintenance (ESM) for UA Apps and UA Infra.
-     You can find our more about the esm service at
-     https://ubuntu.com/security/esm
+     Expanded Security Maintenance for Infrastructure provides access
+     to a private ppa which includes available high and critical CVE fixes
+     for Ubuntu LTS packages in the Ubuntu Main repository between the end
+     of the standard Ubuntu LTS security maintenance and its end of life.
+     It is enabled by default with Ubuntu Pro. You can find out more about
+     the service at https://ubuntu.com/security/esm
 
 fips:
     help: |

diff --git a/ubuntu-advantage/uaclient.conf b/ubuntu-advantage/uaclient.conf
index ec088bdb73f8d772d381cc12d71b1054d74ecc0c..c5b5404c6e962776d408697008c0fb6110e912c3 100644 (file)
--- a/ubuntu-advantage/uaclient.conf
+++ b/ubuntu-advantage/uaclient.conf
@@ -1,6 +1,6 @@
-# Ubuntu-Advantage client config file.
-# If you modify this file, run "ua refresh config" to ensure changes are
-# picked up by Ubuntu-Advantage client.
+# 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