From: Frank Brehm <frank@brehm-online.com>
Date: Tue, 27 Jul 2021 06:33:28 +0000 (+0200)
Subject: committing changes in /etc made by "/usr/bin/apt full-upgrade -y"
X-Git-Url: https://git.uhu-banane.org/?a=commitdiff_plain;h=3837b83b9e0ddb3572ce5aafee59759a09d5d492;p=config%2Fbruni%2Fetc-mint-new1.git

committing changes in /etc made by "/usr/bin/apt full-upgrade -y"

Package changes:
-ubuntu-advantage-tools 27.1~20.04.1 amd64
+ubuntu-advantage-tools 27.2.1~20.04.1 amd64
---

diff --git a/apt/apt.conf.d/20apt-esm-hook.conf b/apt/apt.conf.d/20apt-esm-hook.conf
index 3a06efd..0cc6823 100644
--- a/apt/apt.conf.d/20apt-esm-hook.conf
+++ b/apt/apt.conf.d/20apt-esm-hook.conf
@@ -8,8 +8,8 @@ APT::Install::Post-Invoke-Success {
 
 APT::Install::Pre-Invoke {
 	"[ ! -f /usr/lib/ubuntu-advantage/apt-esm-hook ] || /usr/lib/ubuntu-advantage/apt-esm-hook pre-invoke || true";
-}
+};
 
 AptCli::Hooks::Upgrade {
 	"[ ! -f /usr/lib/ubuntu-advantage/apt-esm-json-hook ] || /usr/lib/ubuntu-advantage/apt-esm-json-hook || true";
-}
+};
diff --git a/ubuntu-advantage/uaclient.conf b/ubuntu-advantage/uaclient.conf
index 9e5def8..7bf292a 100644
--- a/ubuntu-advantage/uaclient.conf
+++ b/ubuntu-advantage/uaclient.conf
@@ -1,6 +1,14 @@
 # Ubuntu-Advantage client config file.
-contract_url: 'https://contracts.canonical.com'
-security_url: 'https://ubuntu.com/security'
+# If you modify this file, run "ua refresh config" to ensure changes are
+# picked up by Ubuntu-Advantage client.
+
+contract_url: https://contracts.canonical.com
 data_dir: /var/lib/ubuntu-advantage
-log_level: debug
 log_file: /var/log/ubuntu-advantage.log
+log_level: debug
+security_url: https://ubuntu.com/security
+ua_config:
+  apt_http_proxy: null
+  apt_https_proxy: null
+  http_proxy: null
+  https_proxy: null