diff --git a/files/etc/apt/trusted.gpg.d/ubuntu-keyring-2018-archive.gpg b/files/etc/apt/trusted.gpg.d/ubuntu-keyring-2018-archive.gpg deleted file mode 100644 index 1cc9f3f2df5734dc3ea7c33be841594b0fcf38ef..0000000000000000000000000000000000000000 Binary files a/files/etc/apt/trusted.gpg.d/ubuntu-keyring-2018-archive.gpg and /dev/null differ diff --git a/files/usr/share/keyrings/ubuntu-archive-keyring.gpg b/files/usr/share/keyrings/ubuntu-archive-keyring.gpg new file mode 100644 index 0000000000000000000000000000000000000000..bb22338544fe6d4c7698048f4ba5b4533c6ec74a Binary files /dev/null and b/files/usr/share/keyrings/ubuntu-archive-keyring.gpg differ diff --git a/manifests/ubuntu_keyring.pp b/manifests/ubuntu_keyring.pp index cc76fb03d4674d0796b566a014316d058431148d..7791a1612cd2c6bdf8b0e9ca98db6b55b2c4516a 100644 --- a/manifests/ubuntu_keyring.pp +++ b/manifests/ubuntu_keyring.pp @@ -19,9 +19,9 @@ class su_debuild::ubuntu_keyring { # Debian bullseye and bookworm do not include any ubuntu-keyring packages so we # install the needed GPG key file directly. 'bullseye', 'bookworm': { - file { '/etc/apt/trusted.gpg.d/ubuntu-keyring-2018-archive.gpg': + file { '/usr/share/keyrings/ubuntu-archive-keyring.gpg': ensure => present, - source => 'puppet:///modules/su_debuild/etc/apt/trusted.gpg.d/ubuntu-keyring-2018-archive.gpg', + source => 'puppet:///modules/su_debuild/usr/share/keyrings/ubuntu-archive-keyring.gpg', mode => '0644', } }