From 6e016cf57c1f88f7a38fad3ec01f4ff27f4deb78 Mon Sep 17 00:00:00 2001
From: Thomas Schneider <thomas@fsmpi.rwth-aachen.de>
Date: Tue, 28 Nov 2023 15:27:34 +0100
Subject: [PATCH] terminalserver: Replace deprecated apt_key module
---
.../x2go-archive-debian-ubuntu-signing-key.gpg | Bin 0 -> 1197 bytes
terminalserver/tasks/x2go.yml | 15 +++++++++------
2 files changed, 9 insertions(+), 6 deletions(-)
create mode 100644 terminalserver/files/x2go-archive-debian-ubuntu-signing-key.gpg
diff --git a/terminalserver/files/x2go-archive-debian-ubuntu-signing-key.gpg b/terminalserver/files/x2go-archive-debian-ubuntu-signing-key.gpg
new file mode 100644
index 0000000000000000000000000000000000000000..81f45d4bfdfa9af37b10ed42adc8410afa9c6fc7
GIT binary patch
literal 1197
zcmbQq$jjne={k>*gW=e;vTgT#=Fh)3QDA~K^UJyKyACiN&tF}(EjZY=NisM4-6o5V
zi(*aMPdP|rOnseLY-1O8b>seZ`K?8KQ`qzNUAeMXvGYiO`HRxWs;6g9`Dd?|srBjV
zlc)U`uUhCiujgs){o~U!*S)HuM4PX-HTt;!hWV9t>pIGMcRgl2b3W+dJmZG^)7C5G
zW#*r*|9vvy_VHit4`PJx?uwYxa&rEyNxxrQzO34DVNL6tP0{C{zF&DsC$V1IY6iR8
zSv9@WJ*WFlZLT{dv{178S#3>aK1=uk$uM~_`Rbx+I}QH7SnbYb@?e4sPlm+ywZb+H
z9#f0<YM5Nm`x1A(H9AU3&^9T2lh(AA41$adj9c^~jMDQJTvC%V6Z7;#lS=bSN)-YU
zld}`kGxO3FY*N4y4i!e}`Fi<9>2{rr7A(SyObkk_OrT(7l4fS(=Hy^!W?~cNVB+NB
zW)WjzW@M6MWD;*+;Nlc`_%p&H`k!{*iemPE#uFz8+-hFh?{Bc7>(=W8@wMxW__TlL
zmECyp>QccrClz;&GY&6jsok$UXsk7VZdb?6T_$%rCB+qYGC0q_^@3OM4}ZL~e^5PN
zXiky)w1&Ss6%T6Z?!Cs{5V>h0oAROUtv_wGJ<qW0eiZdfXvUi$+Y3J!c6n`owLeg1
zO5tbK3GRzrWiGs8`_&<9<Yqem(O;c6-ww!Ms*V-$`_GWc`kFgoUW``2uZScAp1X-(
zIc4s$CcJsB#`8z!+gT^A_nqm<+`BG2MAY6oBzpJEO@-e*Mg@FJ!w#v-?=H{VlNo>Z
z(u(6VY`LmGU)*)4l)JF4^Utl>a)y;mg4?erhwi^;{k|>7Mt3J7>78At{FIf`Pj9Kz
z!ly5-3U;5~^R{92%NfiJUr!d=CR~rQI1{P<fVuu`e~(H^O#1@YYx6WW8?SsSy19NE
zhe_Wgs{`I&^K#0W*BgBM_u#nvMCYD^j$Wz(Pv#YcH=8X#koN!jrgWK|=jYx%%QEA@
z*1XBdGql4mm8<D;oR69#<dyz!Yg6*<HIw&kyZgcTZ&Y#L&P0Vw1NjquiZj1&<yh;)
zF1|(eos<_>BlmWm*Sma~pMMjZxUOMW0lS-y!Joi{z@QWAl8nmY6?xA8p7<P}RCJgx
zF6Q>F`|ocaGz|<fIeFYP`u%Rb$ZOlW%l_T^a${Q_V~2B(@UD~n-KHremCqWN*9%*M
zlU^sIJc|S)69XqKDe)kunDVdefB4TQZevY&ex*3az4z&>`lM}#lbWa8;c<WXN$MKI
zU;Eh%JV`9hmyd7yspmiOgV5I1F1Kbb{T^7N`pc+g_U)KT)2`P%-)dPF&MbN}FP`t)
zguBml&t*LhpLZ>}roXXvUg6XqKA-M#S59I5ULbNHC~ncAB)I@b-aB)=wYRixitX)>
z=oJr`lx6!-YqyB*<>j}n7nR%!V7B@Egi~YghRovdhV6#_7o-oL@zar8bJlHL!*9X#
zPshBQ=57>z)bo5!rP}(fC+C`)uqZtEsD5+5PKL)bJMDnpWix_bZV;PTDN}bnl6@8D
kkMbtp?P2aG&%bV~d>5d7?a_TH&J#0rF8^<?`qSP60K6tH82|tP
literal 0
HcmV?d00001
diff --git a/terminalserver/tasks/x2go.yml b/terminalserver/tasks/x2go.yml
index eb98469..b5d8adb 100644
--- a/terminalserver/tasks/x2go.yml
+++ b/terminalserver/tasks/x2go.yml
@@ -1,12 +1,15 @@
---
- name: ensure apt key for x2go is present
- apt_key:
- keyserver: keys.gnupg.net
- id: E1F958385BFE2B6E
- state: present
- notify:
- - update apt cache
+ copy:
+ src: x2go-archive-debian-ubuntu-signing-key.gpg
+ dest: /etc/apt/trusted.gpg.d
+ owner: root
+ group: root
+ mode: "0644"
+ # Install only if it does not exist yet, this file will get overridden by
+ # the x2go-keyring package
+ force: false
tags:
- x2go
- repos
--
GitLab