saving uncommitted changes in /etc prior to apt run

diff --git a/.etckeeper b/.etckeeper
index e76fb9d2b1c5a357e7d7204b157da3690c43c5b9..69792322796befc1a112e4243e82838454cba519 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -701,6 +701,8 @@ maybe chmod 0644 'apt/apt.conf.d/25coolwsd'
 maybe chmod 0644 'apt/apt.conf.d/50command-not-found'
 maybe chmod 0644 'apt/apt.conf.d/70debconf'
 maybe chmod 0755 'apt/auth.conf.d'
+maybe chmod 0755 'apt/keyrings'
+maybe chmod 0644 'apt/keyrings/icinga.gpg'
 maybe chmod 0755 'apt/preferences.d'
 maybe chmod 0644 'apt/preferences.d/ubuntu-pro-esm-apps'
 maybe chmod 0644 'apt/preferences.d/ubuntu-pro-esm-infra'

diff --git a/apt/keyrings/icinga.gpg b/apt/keyrings/icinga.gpg
new file mode 100644 (file)
index 0000000..4f744c5
Binary files /dev/null and b/apt/keyrings/icinga.gpg differ

diff --git a/apt/sources.list.d/focal-icinga.list b/apt/sources.list.d/focal-icinga.list
index 0132c461dbf8a7b46f9825b7a44173524240b447..199e67fb45b7257f8de87d82fa69737f2603db6c 100644 (file)
--- a/apt/sources.list.d/focal-icinga.list
+++ b/apt/sources.list.d/focal-icinga.list
@@ -1,2 +1,2 @@
-deb [signed-by=/usr/share/keyrings/icinga-archive-keyring.gpg] http://packages.icinga.com/ubuntu icinga-focal main
-deb-src [signed-by=/usr/share/keyrings/icinga-archive-keyring.gpg] http://packages.icinga.com/ubuntu icinga-focal main
+deb [signed-by=/etc/apt/keyrings/icinga.gpg] https://packages.icinga.com/ubuntu icinga-focal main
+deb-src [signed-by=/etc/apt/keyrings/icinga.gpg] https://packages.icinga.com/ubuntu icinga-focal main

diff --git a/icinga2/features-enabled/icingadb.conf b/icinga2/features-enabled/icingadb.conf
new file mode 120000 (symlink)
index 0000000..de51622
--- /dev/null
+++ b/icinga2/features-enabled/icingadb.conf
@@ -0,0 +1 @@
+../features-available/icingadb.conf
\ No newline at end of file