Skip to content

Commit 7649b6b

Browse files
evgenievgeni
committed
switch to using the nodistro nodesource repos
the other ones do not contain the latest releases (e.g. 20.x contains 20.5 vs 20.9)
1 parent af44463 commit 7649b6b

7 files changed

Lines changed: 42 additions & 233 deletions

File tree

‎files/repo/nodesource/NODESOURCE-GPG-SIGNING-KEY-EL‎

Lines changed: 26 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,30 @@
11
-----BEGIN PGP PUBLIC KEY BLOCK-----
22
Version: GnuPG v1
33

4-
mQINBFQCN9QBEADv5QYOlCWNkI/oKST/GGpQkOZjFY2cbYdHuc2j8kyM4oeNluXq
5-
puEYMHOoQvbJ3DFPvsv+jCruL7qjkel9YzaF6e3RN2ystP4YBjxyOT7Bb5EnjNNU
6-
6oScQJ50/+RmA4N3wzBrw5+x5KQGBfRU/k7JdDKO6SGY0zzdAo3jqp1nQ9Sf+Fmg
7-
hsjDLVZTHorLPV3yPLb37QlvBB2YIRF+dL9l4wPAI/fGyWv+Qs7VlCZTyRAnKGbv
8-
qN1LvlYoV9YqxaJYYJW+MQhn4706yNJAFeOZuKejEcnZTd/NBiAR91sVnsXKgW9e
9-
yb4TZ7SqkmrJpuKJBpdPr1dgaK8dDmFh9Nlhpz6xZuYcKaDEDa5b3wymnixtwZf2
10-
WyboChIlsHDajtXZt34xP9uUge1VHyk1o8AQUzKEpuepxxLnyXArLgvHaLhQnxPA
11-
bQB43b4RbWYHPdB16ki2WoZX/DA4YEtfxg8GC3zXC2thMJnFburmts71iiYsxKBc
12-
6d7O8415xrErhk2/o2+bRhf+7qBQfW0oxQSEMBYbqP3hvhG1VWc9umjbCfMgHrHo
13-
IzI7W+GbRdbSsdpY6JNKuCftVfIKXeXk5FbUUP9NzsG/nyGFORkq9y0AKmocx3TD
14-
w9DRG2SmKIKBOG5PQuzuXqsdUaYcFpySXdPNQG2CPtguPhQivw4qM3pQpQARAQAB
15-
tCNOb2RlU291cmNlIDxncGctcnBtQG5vZGVzb3VyY2UuY29tPokCOAQTAQIAIgUC
16-
VAI31AIbAwYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AACgkQXdvo1DT6dN2uaA//
17-
UwKsmnz4MCH7Jn/vG0OinGQTfSH5uvlH68yOZmKLnhtfiqUq1gZz734S75ExxGP4
18-
SGFYeK9CqKFgoGbpjzLLc5kvA7GdDX3E/exEjYa+GrJ9uIOUtaCKstTD5fPVj2Wf
19-
TZtK9v1F6iYKyPHdJnSc5p7AxbLZkarF1CPJQWv2iDrg3dO3Oy41aazRwxJe9hvI
20-
a//XavnsW2TTeo8qfQ0qrs8vzt8bxJF+PkACmqQfbXAiflCct5XEUbhbX1b8KznP
21-
ppd5PLrvRTjHnZi/QRjky0qsUOukGiQhT6iZeiOUcLPeD+f7tA7JBZ08XXRfnLLj
22-
mqYbIHPFG4C/AM5RXu5OdCtFrZQsJgGQEeg/UxYEz5qqNljKjRZ8XsmcyeWouKFM
23-
LuVr1ORF6crl8lAdT3RujP2MzY8cvxJQesYKdWqk3bPXI7oG/PRReoeN86TqraYO
24-
UeTssVlw5lmJtAH+eHt3K6TSjd0rq1RY7xWfttD7L8ECfPmBzbL54MSmKx9MBz+o
25-
a9vOWQ2LjIbR/6DEyQiDpGhQTM+r0/SVS/kqR/j0SEHvOql+sn9sK1/qR1h3JtgI
26-
6YF4IDXBE9s0RBCLbdxtVf3eAcbOnhkhefMtpURJLdVuU8HhMCiVUlHDUPHIuT5z
27-
Lp+avdanIgi8Cnps/DpMI2KigEHW5mmqihXtfKj0jeE=
28-
=9Bql
4+
mQENBFdDN1ABCADaNd/I3j3tn40deQNgz7hB2NvT+syXe6k4ZmdiEcOfBvFrkS8B
5+
hNS67t93etHsxEy7E0qwsZH32bKazMqe9zDwoa3aVImryjh6SHC9lMtW27JPHFeM
6+
Srkt9YmH1WMwWcRO6eSY9B3PpazquhnvbammLuUojXRIxkDroy6Fw4UKmUNSRr32
7+
9Ej87jRoR1B2/57Kfp2Y4+vFGGzSvh3AFQpBHq51qsNHALU6+8PjLfIt+5TPvaWR
8+
TB+kAZnQZkaIQM2nr1n3oj6ak2RATY/+kjLizgFWzgEfbCrbsyq68UoY5FPBnu4Z
9+
E3iDZpaIqwKr0seUC7iA1xM5eHi5kty1oB7HABEBAAG0Ik5Tb2xpZCA8bnNvbGlk
10+
LWdwZ0Bub2Rlc291cmNlLmNvbT6JATgEEwECACIFAldDN1ACGwMGCwkIBwMCBhUI
11+
AgkKCwQWAgMBAh4BAheAAAoJEC9ZtfmbG+C0y7wH/i4xnab36dtrYW7RZwL8i6Sc
12+
NjMx4j9+U1kr/F6YtqWd+JwCbBdar5zRghxPcYEq/qf7MbgAYcs1eSOuTOb7n7+o
13+
xUwdH2iCtHhKh3Jr2mRw1ks7BbFZPB5KmkxHaEBfLT4d+I91ZuUdPXJ+0SXs9gzk
14+
Dbz65Uhoz3W03aiF8HeL5JNARZFMbHHNVL05U1sTGTCOtu+1c/33f3TulQ/XZ3Y4
15+
hwGCpLe0Tv7g7Lp3iLMZMWYPEa0a7S4u8he5IEJQLd8bE8jltcQvrdr3Fm8kI2Jg
16+
BJmUmX4PSfhuTCFaR/yeCt3UoW883bs9LfbTzIx9DJGpRIu8Y0IL3b4sj/GoZVq5
17+
AQ0EV0M3UAEIAKrTaC62ayzqOIPa7nS90BHHck4Z33a2tZF/uof38xNOiyWGhT8u
18+
JeFoTTHn5SQq5Ftyu4K3K2fbbpuu/APQF05AaljzVkDGNMW4pSkgOasdysj831cu
19+
ssrHX2RYS22wg80k6C/Hwmh5F45faEuNxsV+bPx7oPUrt5n6GMx84vEP3i1+FDBi
20+
0pt/B/QnDFBXki1BGvJ35f5NwDefK8VaInxXP3ZN/WIbtn5dqxppkV/YkO7GiJlp
21+
Jlju9rf3kKUIQzKQWxFsbCAPIHoWv7rH9RSxgDithXtG6Yg5R1aeBbJaPNXL9wpJ
22+
YBJbiMjkAFaz4B95FOqZm3r7oHugiCGsHX0AEQEAAYkBHwQYAQIACQUCV0M3UAIb
23+
DAAKCRAvWbX5mxvgtE/OB/0VN88DR3Y3fuqy7lq/dthkn7Dqm9YXdorZl3L152eE
24+
IF882aG8FE3qZdaLGjQO4oShAyNWmRfSGuoH0XERXAI9n0r8m4mDMxE6rtP7tHet
25+
y/5M8x3CTyuMgx5GLDaEUvBusnTD+/v/fBMwRK/cZ9du5PSG4R50rtst+oYyC2ao
26+
x4I2SgjtF/cY7bECsZDplzatN3gv34PkcdIg8SLHAVlL4N5tzumDeizRspcSyoy2
27+
K2+hwKU4C4+dekLLTg8rjnRROvplV2KtaEk6rxKtIRFDCoQng8wfJuIMrDNKvqZw
28+
FRGt7cbvW5MCnuH8MhItOl9Uxp1wHp6gtav/h8Gp6MBa
29+
=MARt
2930
-----END PGP PUBLIC KEY BLOCK-----

‎manifests/init.pp‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,12 @@
1515
Optional[String] $npmrc_auth = $nodejs::params::npmrc_auth,
1616
Optional[Hash] $npmrc_config = $nodejs::params::npmrc_config,
1717
$repo_class = $nodejs::params::repo_class,
18-
$repo_enable_src = $nodejs::params::repo_enable_src,
1918
$repo_ensure = $nodejs::params::repo_ensure,
2019
$repo_pin = $nodejs::params::repo_pin,
2120
$repo_priority = $nodejs::params::repo_priority,
2221
$repo_proxy = $nodejs::params::repo_proxy,
2322
$repo_proxy_password = $nodejs::params::repo_proxy_password,
2423
$repo_proxy_username = $nodejs::params::repo_proxy_username,
25-
Optional[String] $repo_release = $nodejs::params::repo_release,
2624
String[1] $repo_version = $nodejs::params::repo_version,
2725
Array $use_flags = $nodejs::params::use_flags,
2826
Optional[String] $package_provider = $nodejs::params::package_provider,

‎manifests/params.pp‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,12 @@
33
$npmrc_config = undef
44
$nodejs_debug_package_ensure = 'absent'
55
$nodejs_package_ensure = 'installed'
6-
$repo_enable_src = false
76
$repo_ensure = 'present'
87
$repo_pin = undef
98
$repo_priority = 'absent'
109
$repo_proxy = 'absent'
1110
$repo_proxy_password = 'absent'
1211
$repo_proxy_username = 'absent'
13-
$repo_release = undef
1412
$repo_version = ($facts['os']['family'] == 'RedHat' and $facts['os']['release']['major'] == '7') ? {
1513
true => '16',
1614
default => '20',

‎manifests/repo/nodesource.pp‎

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,16 @@
11
# PRIVATE CLASS: Do not use directly
22
class nodejs::repo::nodesource {
3-
$enable_src = $nodejs::repo_enable_src
43
$ensure = $nodejs::repo_ensure
54
$pin = $nodejs::repo_pin
65
$priority = $nodejs::repo_priority
76
$proxy = $nodejs::repo_proxy
87
$proxy_password = $nodejs::repo_proxy_password
98
$proxy_username = $nodejs::repo_proxy_username
10-
$release = $nodejs::repo_release
119

1210
$url_suffix = "${nodejs::repo_version}.x"
1311

1412
case $facts['os']['family'] {
1513
'RedHat': {
16-
if $facts['os']['release']['major'] =~ /^[789]$/ {
17-
$dist_version = $facts['os']['release']['major']
18-
$name_string = "Enterprise Linux ${dist_version}"
19-
}
20-
21-
# Fedora
22-
elsif $facts['os']['name'] == 'Fedora' {
23-
$dist_version = $facts['os']['release']['full']
24-
$name_string = "Fedora Core ${facts['os']['release']['full']}"
25-
}
26-
27-
# newer Amazon Linux releases
28-
elsif ($facts['os']['name'] == 'Amazon') {
29-
$dist_version = '7'
30-
$name_string = 'Enterprise Linux 7'
31-
}
32-
33-
else {
34-
fail("Could not determine NodeSource repository URL for operatingsystem: ${facts['os']['name']} operatingsystemrelease: ${facts['os']['release']['full']}.")
35-
}
36-
37-
$dist_type = $facts['os']['name'] ? {
38-
'Fedora' => 'fc',
39-
default => 'el',
40-
}
41-
42-
# nodesource repo
43-
$descr = "Node.js Packages for ${name_string} - \$basearch"
44-
$baseurl = "https://rpm.nodesource.com/pub_${url_suffix}/${dist_type}/${dist_version}/\$basearch"
45-
46-
# nodesource-source repo
47-
$source_descr = "Node.js for ${name_string} - \$basearch - Source"
48-
$source_baseurl = "https://rpm.nodesource.com/pub_${url_suffix}/${dist_type}/${dist_version}/SRPMS"
49-
5014
contain 'nodejs::repo::nodesource::yum'
5115
}
5216
'Debian': {

‎manifests/repo/nodesource/apt.pp‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,20 @@
11
# PRIVATE CLASS: Do not use directly.
22
class nodejs::repo::nodesource::apt {
3-
$enable_src = $nodejs::repo::nodesource::enable_src
43
$ensure = $nodejs::repo::nodesource::ensure
54
$pin = $nodejs::repo::nodesource::pin
6-
$release = $nodejs::repo::nodesource::release
75
$url_suffix = $nodejs::repo::nodesource::url_suffix
86

97
include apt
108

119
if ($ensure != 'absent') {
1210
apt::source { 'nodesource':
13-
include => {
14-
'src' => $enable_src,
15-
},
1611
key => {
17-
'id' => '9FD3B784BC1C6FC31A8A0A1C1655A0AB68576280',
18-
'source' => 'https://deb.nodesource.com/gpgkey/nodesource.gpg.key',
12+
'id' => '6F71F525282841EEDAF851B42F59B5F99B1BE0B4',
13+
'source' => 'https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key',
1914
},
2015
location => "https://deb.nodesource.com/node_${url_suffix}",
2116
pin => $pin,
22-
release => $release,
17+
release => 'nodistro',
2318
repos => 'main',
2419
}
2520

‎manifests/repo/nodesource/yum.pp‎

Lines changed: 3 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,11 @@
11
# PRIVATE CLASS: Do not use directly.
22
class nodejs::repo::nodesource::yum {
3-
$baseurl = $nodejs::repo::nodesource::baseurl
4-
$descr = $nodejs::repo::nodesource::descr
5-
$enable_src = $nodejs::repo::nodesource::enable_src
63
$ensure = $nodejs::repo::nodesource::ensure
74
$priority = $nodejs::repo::nodesource::priority
85
$proxy = $nodejs::repo::nodesource::proxy
96
$proxy_password = $nodejs::repo::nodesource::proxy_password
107
$proxy_username = $nodejs::repo::nodesource::proxy_username
11-
$source_baseurl = $nodejs::repo::nodesource::source_baseurl
12-
$source_descr = $nodejs::repo::nodesource::source_descr
13-
14-
$yum_source_enabled = $enable_src ? {
15-
true => '1',
16-
default => '0',
17-
}
8+
$url_suffix = $nodejs::repo::nodesource::url_suffix
189

1910
$yum_failovermethod = (versioncmp($facts['os']['release']['major'], '8') >= 0 and $priority == 'absent') ? {
2011
true => 'absent',
@@ -38,8 +29,8 @@
3829
}
3930

4031
yumrepo { 'nodesource':
41-
descr => $descr,
42-
baseurl => $baseurl,
32+
descr => 'Node.js Packages - $basearch',
33+
baseurl => "https://rpm.nodesource.com/pub_${url_suffix}/nodistro/nodejs/\$basearch",
4334
enabled => '1',
4435
failovermethod => $yum_failovermethod,
4536
gpgkey => 'file:///etc/pki/rpm-gpg/NODESOURCE-GPG-SIGNING-KEY-EL',
@@ -52,21 +43,6 @@
5243
require => File['/etc/pki/rpm-gpg/NODESOURCE-GPG-SIGNING-KEY-EL'],
5344
}
5445

55-
yumrepo { 'nodesource-source':
56-
descr => $source_descr,
57-
baseurl => $source_baseurl,
58-
enabled => $yum_source_enabled,
59-
failovermethod => $yum_failovermethod,
60-
gpgkey => 'file:///etc/pki/rpm-gpg/NODESOURCE-GPG-SIGNING-KEY-EL',
61-
gpgcheck => '1',
62-
module_hotfixes => $module_hotfixes,
63-
priority => $priority,
64-
proxy => $proxy,
65-
proxy_password => $proxy_password,
66-
proxy_username => $proxy_username,
67-
require => File['/etc/pki/rpm-gpg/NODESOURCE-GPG-SIGNING-KEY-EL'],
68-
}
69-
7046
file { '/etc/pki/rpm-gpg/NODESOURCE-GPG-SIGNING-KEY-EL':
7147
ensure => file,
7248
group => '0',
@@ -81,10 +57,6 @@
8157
ensure => 'absent',
8258
}
8359

84-
yumrepo { 'nodesource-source':
85-
ensure => 'absent',
86-
}
87-
8860
if versioncmp($facts['os']['release']['major'], '8') >= 0 {
8961
file { 'dnf_module':
9062
ensure => absent,

0 commit comments

Comments
 (0)