Skip to content
Snippets Groups Projects
Commit c74fb515 authored by Lonlone Lee's avatar Lonlone Lee
Browse files

Merge branch 'master_ll' into 'master'

Adjusted the Ubuntu keyring

See merge request !1
parents 60e457e8 4ce1f90c
Branches master
No related tags found
1 merge request!1Adjusted the Ubuntu keyring
File deleted
File added
...@@ -19,9 +19,9 @@ class su_debuild::ubuntu_keyring { ...@@ -19,9 +19,9 @@ class su_debuild::ubuntu_keyring {
# Debian bullseye and bookworm do not include any ubuntu-keyring packages so we # Debian bullseye and bookworm do not include any ubuntu-keyring packages so we
# install the needed GPG key file directly. # install the needed GPG key file directly.
'bullseye', 'bookworm': { 'bullseye', 'bookworm': {
file { '/etc/apt/trusted.gpg.d/ubuntu-keyring-2018-archive.gpg': file { '/usr/share/keyrings/ubuntu-archive-keyring.gpg':
ensure => present, 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', mode => '0644',
} }
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment