Mercurial > repos > other > Puppet

changeset 467:9ae251433074

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Switch from legacy Apt GPG keys to keyrings
author IBBoard <dev@ibboard.co.uk>
date Sat, 23 Mar 2024 19:24:00 +0000
parents 202aeef575a1
children 8a3c3eb60fdd
files common/home_IBBoard_server.gpg manifests/templates.pp
diffstat 2 files changed, 6 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
Binary file common/home_IBBoard_server.gpg has changed
--- a/manifests/templates.pp	Sun Feb 25 10:10:32 2024 +0000
+++ b/manifests/templates.pp	Sat Mar 23 19:24:00 2024 +0000
@@ -316,16 +316,18 @@
 		file { '/etc/pki/':
 			ensure => directory,
 		}
+		file { '/etc/apt/trusted.gpg.d/home_IBBoard_server.gpg':
+			# https://download.opensuse.org/repositories/home:/IBBoard:/server/xUbuntu_22.04/Release.key
+			# Then GPG exported with `cat Release.key | gpg --dearmour -o common/home_IBBoard_server.gpg
+			source => 'puppet:///common/home_IBBoard_server.gpg'
+		}
 
 		apt::source {
 			'ibboard':
 				location => 'http://download.opensuse.org/repositories/home:/IBBoard:/server/xUbuntu_22.04/',
 				release => '/',
 				repos => '',
-				key => {
-					id => 'EDC682701D792970AD8645E7A7A55B845DCFCBE2',
-					source => "https://download.opensuse.org/repositories/home:IBBoard:server/xUbuntu_22.04/Release.key"
-				}
+				keyring => '/etc/apt/trusted.gpg.d/home_IBBoard_server.gpg',
 		}
 	}