From e708027edb3ce3c80d380b8c6ef6e96ec636552a Mon Sep 17 00:00:00 2001 From: cliffmccarthy <16453869+cliffmccarthy@users.noreply.github.com> Date: Wed, 29 Oct 2025 18:39:15 -0500 Subject: [PATCH] feat: Remove obs-home-deltachat.gpg - We don't install Dovecot from OBS anymore. - Removed files.put() that creates /etc/apt/keyrings/obs-home-deltachat.gpg; replaced this with a files.file() that sets present=False to remove the file from any existing installations where it already has been installed. - Removed now-unused obs-home-deltachat.gpg file. - Clarified description of sources.list operation. - Suggested in review by missytake and hpk42. --- cmdeploy/src/cmdeploy/__init__.py | 15 +++------------ cmdeploy/src/cmdeploy/obs-home-deltachat.gpg | Bin 1757 -> 0 bytes 2 files changed, 3 insertions(+), 12 deletions(-) delete mode 100644 cmdeploy/src/cmdeploy/obs-home-deltachat.gpg diff --git a/cmdeploy/src/cmdeploy/__init__.py b/cmdeploy/src/cmdeploy/__init__.py index f7cf2bf6..6f62f165 100644 --- a/cmdeploy/src/cmdeploy/__init__.py +++ b/cmdeploy/src/cmdeploy/__init__.py @@ -1055,20 +1055,11 @@ class ChatmailDeployer(Deployer): @staticmethod def install_impl(): - # Add our OBS repository for dovecot_no_delay - files.put( - name="Add Deltachat OBS GPG key to apt keyring", - src=importlib.resources.files(__package__).joinpath( - "obs-home-deltachat.gpg" - ), - dest="/etc/apt/keyrings/obs-home-deltachat.gpg", - user="root", - group="root", - mode="644", - ) + # Remove OBS repository key that is no longer used. + files.file("/etc/apt/keyrings/obs-home-deltachat.gpg", present=False) files.line( - name="Add DeltaChat OBS home repository to sources.list", + name="Remove DeltaChat OBS home repository from sources.list", path="/etc/apt/sources.list", line="deb [signed-by=/etc/apt/keyrings/obs-home-deltachat.gpg] https://download.opensuse.org/repositories/home:/deltachat/Debian_12/ ./", escape_regex_characters=True, diff --git a/cmdeploy/src/cmdeploy/obs-home-deltachat.gpg b/cmdeploy/src/cmdeploy/obs-home-deltachat.gpg deleted file mode 100644 index 7b7c710e0de7e61895e7a4111b57211063022f01..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1757 zcmV<31|s>H0u2Oa7J={q5CGQOh!)P$15bpwznhL=?e|9{Y%;a?WuQ|mcTF~_=8~BS z<)oIGIiVg5cG)K9+PraeoZJ93lh-h-PxLN+ew~9SX0KvlZ*Oqby&vZNU%hyxYy=|| ztk0}O((M}8CK2c=u=IE}kZ);Fil(I+2?F2_Ad!EF_%2RtR!hoL+>?f3cZv+jdrn3< z`(n+7l`%ZURsK=@V0#QDFR^CaE9?$Wa%(V!8UBY++E=!ZwIFc{`cT1ki2-T}Xou9o z|DT*UZ6l79UkAqxn4~=xtLeA87#gkox6QsJlosXxJFSYLwOBFqN^j@n<+C4}c7|5& zlyA|sLWROY0wBM;E|)o{#pppZir|k_g%#NyWA?-YV3dZ%(*o&e{Euf+2#L`@CWW?E z<0;L~w`Hak@&gY82exFeX!{kaP}{RrQH;isQ2mFqFef&0o2KS^FilIBIV=AKmL1sN z)$#BfG@=|qUvOoJ5P8+2`$|Xf;Cq!wFmgy^4>%QdJ^~%t;>B7Ax6O~lhq{i_4FQoN zK>9=-j<1_l_4sML$+WmUeLA)OwTK<#kC4q|I1;nk$-ljaVCVEs7AL%p6DfKW?t} zIAR|$IDX;Wox&~*Y)ccfuOV7&ORq8YL{XJ+Ep;rS$%I%|q#R95NQHZaR!IxEUw*Bx z8%K|2z{T+@`1DMmwu^AA)n**HEU!FQoLfF@*n?Y9%KC~(Lh$n^arM>6S%RTNFDBU! zU+NWE*8KdpMUeyy1&dDlvb?V=x{)T^heDXIwJRb&2 z_w;f@!EuGhZ#c*5t^pjag+&{8yZ1Ry_h>U}K6D1Mwse9gl#wVK9!@`He9C$8O(5P> zt_==Rf43YYoWcK63rE=t3C483;mtZOcb_?2GfB3gLiTv9BDnVnzOQ^77%-VIBrK`Q6F1q~4Dpyr$DZiWhivFIf~5zj9@le-g>47c zDU_vr9`<#?;IAw}B&rDc3E^39-m-pbWOS1@_Y2nUB4-n>;Nb!hG@rEk$p)rdnshrE zb)ks@GXxU>2ml=xAq31d%sn;bqhvl*T0_qZl8oNgPdfzyW)^|)0162Z&kK@_-que$ z!Q2o2GSO#_5h2N_ji_q%uRg~2CtZy5)(oq1A>>)95#C(#q02iKm2vnxYZ^NQ$H*3$ zb38qcQR#$jzL)ozu1(83$agr)mox*Mn}`+4Z9&uGW?Y5A8pz%Bu7w?;5;f7JrfY7= z%}@+9OqZ(P=lf?*G22p=5Y<9KX+>aPW@_dy%z&LH7py%P3zyAXO0WQ$viIvn0V)1ETexpk{E9#4v4S{=Ms44xdrbj%sM_$AgI%xnnf>@o=I$(T1SZ<>euVuoA>yXN z1);C|{ zh9%>5VBKg2x?{#8e#RJFu1mq9r?TG1%2cJ&R)i_-!fUb$Gi;vD)DAfK@vboRunja