From 25dff163ec567739a30b32ce42bdc65e194c741a Mon Sep 17 00:00:00 2001
From: mhoellein <mario@hoellein.online>
Date: Tue, 16 Jul 2024 11:29:51 +0200
Subject: [PATCH] saving uncommitted changes in /etc prior to apt run

---
 .etckeeper                             |   2 ++
 apt/keyrings/icinga.gpg                | Bin 0 -> 1186 bytes
 apt/sources.list.d/focal-icinga.list   |   4 ++--
 icinga2/features-enabled/icingadb.conf |   1 +
 4 files changed, 5 insertions(+), 2 deletions(-)
 create mode 100644 apt/keyrings/icinga.gpg
 create mode 120000 icinga2/features-enabled/icingadb.conf

diff --git a/.etckeeper b/.etckeeper
index e76fb9d2b..697923227 100755
--- 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
index 0000000000000000000000000000000000000000..4f744c5ef879b141e4e7fd74b1f34505edcd12a9
GIT binary patch
literal 1186
zcmV;T1YP@?0ipy_ht5tB1OSp8!Uay(@Zp;cC;&9vXZg3fFR-PjOSv2|iCzLHa;B(G
znn9q_m#vA53_XPYFz2ZVkw!N>5WtvOt<u!T6B1dhxL!Q~t_nl;_U}{ZBk?x$+F!9s
zqeef-*D+pHoUR~d%GemS55FEexYJlfgh>Enk6}CLh8e{sA-L0LbC&?1;_gV*7e%I7
zDfE*%ywg2Y5&)UO1OI62?L-E!`#fOikCMp-9JqhYcn<L^+%ybAE(YlaF`O5IETix?
zOaedHp^00m0bBFhf4#Pr)jG5Orn=WxCYoS04Ede<M7N8XDV(mMC7<uTd-NTF{b_Xu
z#s4|Y+=j;hfd=-ZKk7VR)nO7;`WxLsO0~`Sx^Y`E$q^Nk;xGgLI-PiV)Fd$zZ(7Ri
zwFZI?#q967aa3KOD?g@!hk}}j-#{jeyQCPN3p*-zy3Y~eh|Czs`zS=a%6-{xid!=D
z#oLyBh&>~=wi!7*38L57;ETHn%6GI?4=kC>G-F!L6Xj0QL<Ov*w5?+k9VzPV_EPdf
zBuBKoCYAtCsjVP~v_45=X>Mm>AWv{*ZXi={b#h~6AWd&>X>@OLX>MmAC_;5<Y-AvF
zWpZ|9aw#A@X>Mk3Kxt!XZf9XGZ*pfoh+qU05dr`p1p-os&Q1aw0|pBT2nPcK1Qh}Z
z0|XWV0|5da0Rk6*0162Z#^V{oG(iS}fg}K(7}s^XGOIYMhHPH|r{6S|E-?HZ0HBim
zghE#&GXjx8w18088>q@}_zSrL4Fpn$&Q1^r0KEJol|({|%=-Jdy3%?$pI)6c#Itvx
z6Y!|Brv0n*8I1+^{}|Q=oP4Nn@XWSjwtB%XRBtfrYR>j;aL+aKjk{*GPR(aj;P@}A
zc}<8I)o$G;EfG?`Q8GsY65N8ky~sa(>s>8i^L7^<_YwOZ_lcJ}w}E^s!?IyUNzUUL
zQ$ksKOh<UrV<Dr~C>VE~?K?5L+&>^cBd&2Y<@ptj{BJ~{U~lThs*{(3cTsF6RkA^T
z0VaLeuqJWd==BX^^mGY!&Zj5pZA{{b^`kYo?8=P&=gK+7dRFkP^&<Qi^F_Uv2jH@^
zdg?+$n8Y~RoK96`oViG-hkfOq10#SH_W%P02mec}3ImD<<J&`FzHtHdG7_F!dVM)h
zH3@BdG-tS9MGW%y>(FgsnwetYgLDy5Q}NaA2v6m?yh*us2n|fZFqE?h?kvJQHv`{b
zd7~3m##iIxZweY&SXd!r`R7>s5|h6V&mMXHcCxH2PPrQlcm(n0^h%Z-fLH0G^KJ&o
zWt}>IsMb^%zc;tP=6@xV73xcE!vv?MYMic1Sh?!K`<VocX%<iZD2}dx33_AA#{Eb_
zOr*yRu%TlnOtOnGApeW*1I6gX=Sxa=7LF}9I2<snYTI!A6-hg%@Dq)AA#u#Vee}<P
z%2=1LF%N>70iUxA!omlEKiT{|i%X0Y09=Sk1Q-zl00{*GQisk?0vikf3JDO#;~B#=
zK?Z`(kN}$n4WS&eN&ji&ZU5Oo^*qa-BLl4fpw(10#H*6YJy<x2r_H-WkuwMn(ToKm
Ap8x;=

literal 0
HcmV?d00001

diff --git a/apt/sources.list.d/focal-icinga.list b/apt/sources.list.d/focal-icinga.list
index 0132c461d..199e67fb4 100644
--- 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
index 000000000..de51622e9
--- /dev/null
+++ b/icinga2/features-enabled/icingadb.conf
@@ -0,0 +1 @@
+../features-available/icingadb.conf
\ No newline at end of file
-- 
2.43.0