Skip to content

Commit aa01045

Browse files
committed
use new deb822 format
1 parent f39eb79 commit aa01045

1 file changed

Lines changed: 31 additions & 9 deletions

File tree

  • manifests/repo/nodesource

manifests/repo/nodesource/apt.pp

Lines changed: 31 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,31 @@
11
# PRIVATE CLASS: Do not use directly.
22
class nodejs::repo::nodesource::apt {
33
$ensure = $nodejs::repo::nodesource::ensure
4-
$pin = $nodejs::repo::nodesource::pin
4+
$priority = $nodejs::repo::nodesource::priority
55
$url_suffix = $nodejs::repo::nodesource::url_suffix
66

77
include apt
88

99
if ($ensure != 'absent') {
10+
apt::keyring { 'nodesource':
11+
source => 'https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key',
12+
dir => '/usr/share/keyrings',
13+
filename => 'nodesource-repo.gpg.key.asc',
14+
}
15+
1016
apt::source { 'nodesource':
11-
key => {
12-
'name' => 'nodesource-repo.gpg.key.asc',
13-
'source' => 'https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key',
14-
},
15-
location => "https://deb.nodesource.com/node_${url_suffix}",
16-
pin => $pin,
17-
release => 'nodistro',
18-
repos => 'main',
17+
source_format => 'sources',
18+
location => ["https://deb.nodesource.com/node_${url_suffix}",],
19+
keyring => '/usr/share/keyrings/nodesource-repo.gpg.key.asc',
20+
release => ['nodistro',],
21+
repos => ['main',],
22+
types => ['deb',],
23+
require => Apt::Keyring['nodesource'],
24+
}
25+
26+
apt::pin { 'nodesource':
27+
origin => 'deb.nodesource.com',
28+
priority => $priority,
1929
}
2030

2131
Apt::Source['nodesource'] -> Package<| tag == 'nodesource_repo' |>
@@ -26,5 +36,17 @@
2636
apt::source { 'nodesource':
2737
ensure => 'absent',
2838
}
39+
apt::pin { 'nodesource':
40+
ensure => 'absent',
41+
}
42+
apt::keyring { 'nodesource':
43+
ensure => 'absent',
44+
dir => '/usr/share/keyrings',
45+
filename => 'nodesource-repo.gpg.key.asc',
46+
}
47+
file { '/etc/apt/sources.list.d/nodesource.sources':
48+
ensure => 'absent',
49+
notify => Class['Apt::Update'],
50+
}
2951
}
3052
}

0 commit comments

Comments
 (0)