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

Package changes:
-linux-firmware 1.187.19 all
+linux-firmware 1.187.20 all
-ubuntu-advantage-tools 27.2.2~20.04.1 amd64
+ubuntu-advantage-tools 27.3~20.04.1 amd64

diff --git a/.etckeeper b/.etckeeper
index 5da2e9a4701eaf0b75f57ff191a8757380eb8d20..1bf4f825d60b56b03c486b0ca6168e420ed67f31 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -1577,6 +1577,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/logrotate.d/ubuntu-advantage-tools b/logrotate.d/ubuntu-advantage-tools
index 1dede3f5cc1ede55706dec0a948fb4ccedb0b00e..76e6b47c816301ea48f15fe0c10f3599d262bfdf 100644 (file)
--- a/logrotate.d/ubuntu-advantage-tools
+++ b/logrotate.d/ubuntu-advantage-tools
@@ -1,4 +1,7 @@
-/var/log/ubuntu-advantage.log {
+# use the root group by default, since this is the owning group
+# of /var/log/ubuntu-advantage*.log files.
+/var/log/ubuntu-advantage*.log {
+    su root root
     rotate 6
     monthly
     compress

diff --git a/systemd/system/multi-user.target.wants/ua-license-check.path b/systemd/system/multi-user.target.wants/ua-license-check.path
new file mode 120000 (symlink)
index 0000000..d0f60ae
--- /dev/null
+++ b/systemd/system/multi-user.target.wants/ua-license-check.path
@@ -0,0 +1 @@
+/lib/systemd/system/ua-license-check.path
\ No newline at end of file

diff --git a/systemd/system/timers.target.wants/ua-messaging.timer b/systemd/system/timers.target.wants/ua-messaging.timer
deleted file mode 120000 (symlink)
index a9be21a..0000000
--- a/systemd/system/timers.target.wants/ua-messaging.timer
+++ /dev/null
@@ -1 +0,0 @@
-/lib/systemd/system/ua-messaging.timer
\ No newline at end of file

diff --git a/systemd/system/timers.target.wants/ua-timer.timer b/systemd/system/timers.target.wants/ua-timer.timer
new file mode 120000 (symlink)
index 0000000..470cbfa
--- /dev/null
+++ b/systemd/system/timers.target.wants/ua-timer.timer
@@ -0,0 +1 @@
+/lib/systemd/system/ua-timer.timer
\ No newline at end of file

diff --git a/ubuntu-advantage/help_data.yaml b/ubuntu-advantage/help_data.yaml
index da222a3ac59e05a6805c57b1444ec95f5503516e..3c93645a757a07a7ed67d394d66284d5e6bb1fc5 100644 (file)
--- a/ubuntu-advantage/help_data.yaml
+++ b/ubuntu-advantage/help_data.yaml
@@ -43,7 +43,7 @@ fips:
       FIPS 140-2 is a set of publicly announced cryptographic standards
       developed by the National Institute of Standards and Technology
       applicable for FedRAMP, HIPAA, PCI and ISO compliance use cases.
-      Note that ‘fips’ does not provide security patching. For fips certified
+      Note that "fips" does not provide security patching. For fips certified
       modules with security patches please refer to fips-updates. The modules
       are certified on Intel x86_64 and IBM Z hardware platforms for Ubuntu
       18.04 and Intel x86_64, IBM Power8 and IBM Z hardware platforms for
@@ -66,3 +66,21 @@ livepatch:
       livepatches cannot be enabled on fips-enabled systems. You can find out
       more about Ubuntu Kernel Livepatch service at
       https://ubuntu.com/security/livepatch
+
+ros:
+  help: |
+    ros provides access to a private PPA which includes security-related
+    updates for available high and critical CVE fixes for Robot Operating
+    System (ROS) packages. For access to ROS ESM and security updates, both
+    esm-infra and esm-apps services will also be enabled. To get additional
+    non-security updates, enable ros-updates. You can find out more about the
+    ROS ESM service at https://ubuntu.com/robotics/ros-esm
+
+ros-updates:
+  help: |
+    ros-updates provides access to a private PPA which includes
+    non-security-related updates for Robot Operating System (ROS) packages.
+    For full access to ROS ESM, security and non-security updates,
+    the esm-infra, esm-apps, and ros services will also be enabled. You can
+    find out more about the ROS ESM service at
+    https://ubuntu.com/robotics/ros-esm

diff --git a/ubuntu-advantage/uaclient.conf b/ubuntu-advantage/uaclient.conf
index 7bf292a31eeb3597c6ce405acee72617bbe67f7c..861ead5712bbd3edb3f97149b70a3a2e4e3f759c 100644 (file)
--- a/ubuntu-advantage/uaclient.conf
+++ b/ubuntu-advantage/uaclient.conf
@@ -7,8 +7,12 @@ 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
 ua_config:
   apt_http_proxy: null
   apt_https_proxy: null
   http_proxy: null
   https_proxy: null
+  update_messaging_timer: 21600
+  update_status_timer: 43200
+  metering_timer: 0