From: mhoellein <mhoellein@freenet.de>
Date: Wed, 28 Jul 2021 17:50:08 +0000 (+0200)
Subject: committing changes in /etc after apt run
X-Git-Url: https://git.hoellein.online/?a=commitdiff_plain;h=cdff617f4bc8c1dfb04634132a3bb87de5142565;p=homeserver

committing changes in /etc after apt run

Package changes:
-aspell 0.60.7~20110707-4ubuntu0.1 amd64
+aspell 0.60.7~20110707-4ubuntu0.2 amd64
-code-brand 6.4-19 all
+code-brand 6.4-20 all
-curl 7.58.0-2ubuntu3.13 amd64
+curl 7.58.0-2ubuntu3.14 amd64
-firefox 90.0+linuxmint1+tricia amd64
-firefox-locale-de 90.0+linuxmint1+tricia amd64
-firefox-locale-en 90.0+linuxmint1+tricia amd64
+firefox 90.0.2+linuxmint1+tricia amd64
+firefox-locale-de 90.0.2+linuxmint1+tricia amd64
+firefox-locale-en 90.0.2+linuxmint1+tricia amd64
-hexchat 2.14.1-2 amd64
-hexchat-common 2.14.1-2 all
+hexchat 2.14.1-2ubuntu0.18.04.1 amd64
+hexchat-common 2.14.1-2ubuntu0.18.04.1 all
-icinga-php-library 0.6.0-1.bionic all
+icinga-php-library 0.6.1-1.bionic all
-icingacli 2.9.0-1.bionic all
-icingaweb2 2.9.0-1.bionic all
-icingaweb2-common 2.9.0-1.bionic all
-icingaweb2-module-monitoring 2.9.0-1.bionic all
+icingacli 2.9.2-1.bionic all
+icingaweb2 2.9.2-1.bionic all
+icingaweb2-common 2.9.2-1.bionic all
+icingaweb2-module-monitoring 2.9.2-1.bionic all
-libaspell15 0.60.7~20110707-4ubuntu0.1 amd64
+libaspell15 0.60.7~20110707-4ubuntu0.2 amd64
-libcurl3-gnutls 7.58.0-2ubuntu3.13 amd64
-libcurl4 7.58.0-2ubuntu3.13 amd64
+libcurl3-gnutls 7.58.0-2ubuntu3.14 amd64
+libcurl4 7.58.0-2ubuntu3.14 amd64
-libjavascriptcoregtk-4.0-18 2.32.0-0ubuntu0.18.04.1 amd64
+libjavascriptcoregtk-4.0-18 2.32.3-0ubuntu0.18.04.1 amd64
-libmysqlclient20 5.7.34-0ubuntu0.18.04.1 amd64
+libmysqlclient20 5.7.35-0ubuntu0.18.04.1 amd64
-libwebkit2gtk-4.0-37 2.32.0-0ubuntu0.18.04.1 amd64
+libwebkit2gtk-4.0-37 2.32.3-0ubuntu0.18.04.1 amd64
-loolwsd 6.4.10-5 amd64
+loolwsd 6.4.10-6 amd64
-mint-mirrors 1.2.1 all
+mint-mirrors 1.2.2 all
-mintsystem 8.5.1 all
+mintsystem 8.5.2 all
-php-icinga 2.9.0-1.bionic all
+php-icinga 2.9.2-1.bionic all
-ubuntu-advantage-tools 27.1~18.04.1 amd64
+ubuntu-advantage-tools 27.2.2~18.04.1 amd64
---

diff --git a/apt/apt.conf.d/20apt-esm-hook.conf b/apt/apt.conf.d/20apt-esm-hook.conf
index 3a06efdf..0cc68239 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 9e5def80..7bf292a3 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