Skip to content

Commit

Permalink
Use modern APT keyrings on Debian family
Browse files Browse the repository at this point in the history
This makes use of puppetlabs/puppetlabs-apt#1128 to store the public key
in `/etc/apt/keyrings` and add a `signed-by` option to the
`sources.list.d` entry.
  • Loading branch information
smortex committed Feb 13, 2024
1 parent 17a0178 commit 319c89e
Show file tree
Hide file tree
Showing 2 changed files with 56 additions and 3 deletions.
53 changes: 53 additions & 0 deletions files/syslog-ng-ose-pub.asc
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
-----BEGIN PGP PUBLIC KEY BLOCK-----

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
4O+oN1OOJN44soLNH18oojQU9Mg=
=+kU7
-----END PGP PUBLIC KEY BLOCK-----
6 changes: 3 additions & 3 deletions manifests/repo.pp
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@
repos => "${fact('os.name')}-${fact('os.distro.codename')}".downcase,
release => 'stable',
key => {
ensure => 'refreshed',
id => '2E6994033390DE82D8E6A2D16E187A4C6694369F',
source => "${release_url}syslog-ng-ose-pub.asc",
name => 'syslog-ng.asc',
# https://ose-repo.syslog-ng.com/apt/syslog-ng-ose-pub.asc
content => file("${module_name}/syslog-ng-ose-pub.asc"),
},
include => {
deb => true,
Expand Down

0 comments on commit 319c89e

Please sign in to comment.