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)
voxpupuli · Oct 28, 2023 · 5b1cff6 · 5b1cff6
1 parent ff1fd3f
commit 5b1cff6
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 90 deletions.
diff --git a/files/repo/nodesource/NODESOURCE-GPG-SIGNING-KEY-EL b/files/repo/nodesource/NODESOURCE-GPG-SIGNING-KEY-EL
@@ -1,29 +1,30 @@
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 Version: GnuPG v1
 
-mQINBFQCN9QBEADv5QYOlCWNkI/oKST/GGpQkOZjFY2cbYdHuc2j8kyM4oeNluXq
-puEYMHOoQvbJ3DFPvsv+jCruL7qjkel9YzaF6e3RN2ystP4YBjxyOT7Bb5EnjNNU
-6oScQJ50/+RmA4N3wzBrw5+x5KQGBfRU/k7JdDKO6SGY0zzdAo3jqp1nQ9Sf+Fmg
-hsjDLVZTHorLPV3yPLb37QlvBB2YIRF+dL9l4wPAI/fGyWv+Qs7VlCZTyRAnKGbv
-qN1LvlYoV9YqxaJYYJW+MQhn4706yNJAFeOZuKejEcnZTd/NBiAR91sVnsXKgW9e
-yb4TZ7SqkmrJpuKJBpdPr1dgaK8dDmFh9Nlhpz6xZuYcKaDEDa5b3wymnixtwZf2
-WyboChIlsHDajtXZt34xP9uUge1VHyk1o8AQUzKEpuepxxLnyXArLgvHaLhQnxPA
-bQB43b4RbWYHPdB16ki2WoZX/DA4YEtfxg8GC3zXC2thMJnFburmts71iiYsxKBc
-6d7O8415xrErhk2/o2+bRhf+7qBQfW0oxQSEMBYbqP3hvhG1VWc9umjbCfMgHrHo
-IzI7W+GbRdbSsdpY6JNKuCftVfIKXeXk5FbUUP9NzsG/nyGFORkq9y0AKmocx3TD
-w9DRG2SmKIKBOG5PQuzuXqsdUaYcFpySXdPNQG2CPtguPhQivw4qM3pQpQARAQAB
-tCNOb2RlU291cmNlIDxncGctcnBtQG5vZGVzb3VyY2UuY29tPokCOAQTAQIAIgUC
-VAI31AIbAwYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AACgkQXdvo1DT6dN2uaA//
-UwKsmnz4MCH7Jn/vG0OinGQTfSH5uvlH68yOZmKLnhtfiqUq1gZz734S75ExxGP4
-SGFYeK9CqKFgoGbpjzLLc5kvA7GdDX3E/exEjYa+GrJ9uIOUtaCKstTD5fPVj2Wf
-TZtK9v1F6iYKyPHdJnSc5p7AxbLZkarF1CPJQWv2iDrg3dO3Oy41aazRwxJe9hvI
-a//XavnsW2TTeo8qfQ0qrs8vzt8bxJF+PkACmqQfbXAiflCct5XEUbhbX1b8KznP
-ppd5PLrvRTjHnZi/QRjky0qsUOukGiQhT6iZeiOUcLPeD+f7tA7JBZ08XXRfnLLj
-mqYbIHPFG4C/AM5RXu5OdCtFrZQsJgGQEeg/UxYEz5qqNljKjRZ8XsmcyeWouKFM
-LuVr1ORF6crl8lAdT3RujP2MzY8cvxJQesYKdWqk3bPXI7oG/PRReoeN86TqraYO
-UeTssVlw5lmJtAH+eHt3K6TSjd0rq1RY7xWfttD7L8ECfPmBzbL54MSmKx9MBz+o
-a9vOWQ2LjIbR/6DEyQiDpGhQTM+r0/SVS/kqR/j0SEHvOql+sn9sK1/qR1h3JtgI
-6YF4IDXBE9s0RBCLbdxtVf3eAcbOnhkhefMtpURJLdVuU8HhMCiVUlHDUPHIuT5z
-Lp+avdanIgi8Cnps/DpMI2KigEHW5mmqihXtfKj0jeE=
-=9Bql
+mQENBFdDN1ABCADaNd/I3j3tn40deQNgz7hB2NvT+syXe6k4ZmdiEcOfBvFrkS8B
+hNS67t93etHsxEy7E0qwsZH32bKazMqe9zDwoa3aVImryjh6SHC9lMtW27JPHFeM
+Srkt9YmH1WMwWcRO6eSY9B3PpazquhnvbammLuUojXRIxkDroy6Fw4UKmUNSRr32
+9Ej87jRoR1B2/57Kfp2Y4+vFGGzSvh3AFQpBHq51qsNHALU6+8PjLfIt+5TPvaWR
+TB+kAZnQZkaIQM2nr1n3oj6ak2RATY/+kjLizgFWzgEfbCrbsyq68UoY5FPBnu4Z
+E3iDZpaIqwKr0seUC7iA1xM5eHi5kty1oB7HABEBAAG0Ik5Tb2xpZCA8bnNvbGlk
+LWdwZ0Bub2Rlc291cmNlLmNvbT6JATgEEwECACIFAldDN1ACGwMGCwkIBwMCBhUI
+AgkKCwQWAgMBAh4BAheAAAoJEC9ZtfmbG+C0y7wH/i4xnab36dtrYW7RZwL8i6Sc
+NjMx4j9+U1kr/F6YtqWd+JwCbBdar5zRghxPcYEq/qf7MbgAYcs1eSOuTOb7n7+o
+xUwdH2iCtHhKh3Jr2mRw1ks7BbFZPB5KmkxHaEBfLT4d+I91ZuUdPXJ+0SXs9gzk
+Dbz65Uhoz3W03aiF8HeL5JNARZFMbHHNVL05U1sTGTCOtu+1c/33f3TulQ/XZ3Y4
+hwGCpLe0Tv7g7Lp3iLMZMWYPEa0a7S4u8he5IEJQLd8bE8jltcQvrdr3Fm8kI2Jg
+BJmUmX4PSfhuTCFaR/yeCt3UoW883bs9LfbTzIx9DJGpRIu8Y0IL3b4sj/GoZVq5
+AQ0EV0M3UAEIAKrTaC62ayzqOIPa7nS90BHHck4Z33a2tZF/uof38xNOiyWGhT8u
+JeFoTTHn5SQq5Ftyu4K3K2fbbpuu/APQF05AaljzVkDGNMW4pSkgOasdysj831cu
+ssrHX2RYS22wg80k6C/Hwmh5F45faEuNxsV+bPx7oPUrt5n6GMx84vEP3i1+FDBi
+0pt/B/QnDFBXki1BGvJ35f5NwDefK8VaInxXP3ZN/WIbtn5dqxppkV/YkO7GiJlp
+Jlju9rf3kKUIQzKQWxFsbCAPIHoWv7rH9RSxgDithXtG6Yg5R1aeBbJaPNXL9wpJ
+YBJbiMjkAFaz4B95FOqZm3r7oHugiCGsHX0AEQEAAYkBHwQYAQIACQUCV0M3UAIb
+DAAKCRAvWbX5mxvgtE/OB/0VN88DR3Y3fuqy7lq/dthkn7Dqm9YXdorZl3L152eE
+IF882aG8FE3qZdaLGjQO4oShAyNWmRfSGuoH0XERXAI9n0r8m4mDMxE6rtP7tHet
+y/5M8x3CTyuMgx5GLDaEUvBusnTD+/v/fBMwRK/cZ9du5PSG4R50rtst+oYyC2ao
+x4I2SgjtF/cY7bECsZDplzatN3gv34PkcdIg8SLHAVlL4N5tzumDeizRspcSyoy2
+K2+hwKU4C4+dekLLTg8rjnRROvplV2KtaEk6rxKtIRFDCoQng8wfJuIMrDNKvqZw
+FRGt7cbvW5MCnuH8MhItOl9Uxp1wHp6gtav/h8Gp6MBa
+=MARt
 -----END PGP PUBLIC KEY BLOCK-----
diff --git a/manifests/repo/nodesource.pp b/manifests/repo/nodesource.pp
@@ -12,39 +12,9 @@
 
   case $facts['os']['family'] {
     'RedHat': {
-      if $facts['os']['release']['major'] =~ /^[789]$/ {
-        $dist_version = $facts['os']['release']['major']
-        $name_string  = "Enterprise Linux ${dist_version}"
-      }
-
-      # Fedora
-      elsif $facts['os']['name'] == 'Fedora' {
-        $dist_version  = $facts['os']['release']['full']
-        $name_string   = "Fedora Core ${facts['os']['release']['full']}"
-      }
-
-      # newer Amazon Linux releases
-      elsif ($facts['os']['name'] == 'Amazon') {
-        $dist_version = '7'
-        $name_string  = 'Enterprise Linux 7'
-      }
-
-      else {
-        fail("Could not determine NodeSource repository URL for operatingsystem: ${facts['os']['name']} operatingsystemrelease: ${facts['os']['release']['full']}.")
-      }
-
-      $dist_type = $facts['os']['name'] ? {
-        'Fedora' => 'fc',
-        default  => 'el',
-      }
-
       # nodesource repo
-      $descr   = "Node.js Packages for ${name_string} - \$basearch"
-      $baseurl = "https://rpm.nodesource.com/pub_${url_suffix}/${dist_type}/${dist_version}/\$basearch"
-
-      # nodesource-source repo
-      $source_descr   = "Node.js for ${name_string} - \$basearch - Source"
-      $source_baseurl = "https://rpm.nodesource.com/pub_${url_suffix}/${dist_type}/${dist_version}/SRPMS"
+      $descr   = "Node.js Packages - \$basearch"
+      $baseurl = "https://rpm.nodesource.com/pub_${url_suffix}/nodistro/nodejs/\$basearch"
 
       contain 'nodejs::repo::nodesource::yum'
     }

diff --git a/manifests/repo/nodesource/apt.pp b/manifests/repo/nodesource/apt.pp
@@ -1,25 +1,20 @@
 # PRIVATE CLASS: Do not use directly.
 class nodejs::repo::nodesource::apt {
-  $enable_src = $nodejs::repo::nodesource::enable_src
   $ensure     = $nodejs::repo::nodesource::ensure
   $pin        = $nodejs::repo::nodesource::pin
-  $release    = $nodejs::repo::nodesource::release
   $url_suffix = $nodejs::repo::nodesource::url_suffix
 
   include apt
 
   if ($ensure != 'absent') {
     apt::source { 'nodesource':
-      include  => {
-        'src' => $enable_src,
-      },
       key      => {
         'id'     => '9FD3B784BC1C6FC31A8A0A1C1655A0AB68576280',
         'source' => 'https://deb.nodesource.com/gpgkey/nodesource.gpg.key',
       },
       location => "https://deb.nodesource.com/node_${url_suffix}",
       pin      => $pin,
-      release  => $release,
+      release  => 'nosource',
       repos    => 'main',
     }
 

diff --git a/manifests/repo/nodesource/yum.pp b/manifests/repo/nodesource/yum.pp
@@ -2,19 +2,11 @@
 class nodejs::repo::nodesource::yum {
   $baseurl        = $nodejs::repo::nodesource::baseurl
   $descr          = $nodejs::repo::nodesource::descr
-  $enable_src     = $nodejs::repo::nodesource::enable_src
   $ensure         = $nodejs::repo::nodesource::ensure
   $priority       = $nodejs::repo::nodesource::priority
   $proxy          = $nodejs::repo::nodesource::proxy
   $proxy_password = $nodejs::repo::nodesource::proxy_password
   $proxy_username = $nodejs::repo::nodesource::proxy_username
-  $source_baseurl = $nodejs::repo::nodesource::source_baseurl
-  $source_descr   = $nodejs::repo::nodesource::source_descr
-
-  $yum_source_enabled = $enable_src ? {
-    true    => '1',
-    default => '0',
-  }
 
   $yum_failovermethod = (versioncmp($facts['os']['release']['major'], '8') >= 0 and $priority == 'absent') ? {
     true    => 'absent',
@@ -52,21 +44,6 @@
       require         => File['/etc/pki/rpm-gpg/NODESOURCE-GPG-SIGNING-KEY-EL'],
     }
 
-    yumrepo { 'nodesource-source':
-      descr           => $source_descr,
-      baseurl         => $source_baseurl,
-      enabled         => $yum_source_enabled,
-      failovermethod  => $yum_failovermethod,
-      gpgkey          => 'file:///etc/pki/rpm-gpg/NODESOURCE-GPG-SIGNING-KEY-EL',
-      gpgcheck        => '1',
-      module_hotfixes => $module_hotfixes,
-      priority        => $priority,
-      proxy           => $proxy,
-      proxy_password  => $proxy_password,
-      proxy_username  => $proxy_username,
-      require         => File['/etc/pki/rpm-gpg/NODESOURCE-GPG-SIGNING-KEY-EL'],
-    }
-
     file { '/etc/pki/rpm-gpg/NODESOURCE-GPG-SIGNING-KEY-EL':
       ensure => file,
       group  => '0',
@@ -81,10 +58,6 @@
       ensure => 'absent',
     }
 
-    yumrepo { 'nodesource-source':
-      ensure => 'absent',
-    }
-
     if versioncmp($facts['os']['release']['major'], '8') >= 0 {
       file { 'dnf_module':
         ensure => absent,