trixie: apt: Install GPG key in /usr/share/keyrings instead of /etc/apt/trusted.gpg.d

Salamandar · Salamandar · commit 297cdd737c01 · 2026-01-02T16:18:58.000+01:00
Signed-off-by: Félix Piédallu &lt;felix@piedallu.me&gt;
diff --git a/trixie b/trixie
@@ -602,12 +602,12 @@ Types: deb
 URIs: http://repo.yunohost.org/debian/
 Suites: trixie
 Components: $components
-Signed-By: /etc/apt/trusted.gpg.d/yunohost-trixie.gpg
+Signed-By: /usr/share/keyrings/yunohost-trixie.gpg
 "
     echo "$deb_sources" > /etc/apt/sources.list.d/yunohost.sources
 
     # Add YunoHost repository key to the keyring
-    curl --fail --silent https://repo.yunohost.org/keys/yunohost_trixie.asc | gpg --dearmor > /etc/apt/trusted.gpg.d/yunohost-trixie.gpg
+    curl --fail --silent https://repo.yunohost.org/keys/yunohost_trixie.asc | gpg -o /usr/share/keyrings/yunohost-trixie.gpg --dearmor
     apt_update
 }
 

Original file line number	Diff line number	Diff line change
`@@ -602,12 +602,12 @@ Types: deb`
`602`	`602`	`URIs: http://repo.yunohost.org/debian/`
`603`	`603`	`Suites: trixie`
`604`	`604`	`Components: $components`
`605`		`-Signed-By: /etc/apt/trusted.gpg.d/yunohost-trixie.gpg`
	`605`	`+Signed-By: /usr/share/keyrings/yunohost-trixie.gpg`
`606`	`606`	`"`
`607`	`607`	`echo "$deb_sources" > /etc/apt/sources.list.d/yunohost.sources`
`608`	`608`
`609`	`609`	`# Add YunoHost repository key to the keyring`
`610`		`- curl --fail --silent https://repo.yunohost.org/keys/yunohost_trixie.asc \| gpg --dearmor > /etc/apt/trusted.gpg.d/yunohost-trixie.gpg`
	`610`	`+ curl --fail --silent https://repo.yunohost.org/keys/yunohost_trixie.asc \| gpg -o /usr/share/keyrings/yunohost-trixie.gpg --dearmor`
`611`	`611`	`apt_update`
`612`	`612`	`}`
`613`	`613`