Skip to content

Commit c57d13b

Browse files
committed
Add new v2 GPG key
The ELRepo project has started using a new GPG key [1]. [1] https://elrepoproject.blogspot.com/2025/01/the-elrepo-project-has-released-new-rpm.html Signed-off-by: Lance Albertson <[email protected]>
1 parent 588395d commit c57d13b

File tree

8 files changed

+10
-10
lines changed

8 files changed

+10
-10
lines changed

.github/workflows/ci.yml

+1-3
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@ jobs:
2626
- almalinux-8
2727
- almalinux-9
2828
- amazonlinux-2023
29-
- centos-7
30-
- centos-stream-8
3129
- centos-stream-9
3230
- rockylinux-8
3331
- rockylinux-9
@@ -39,7 +37,7 @@ jobs:
3937
- name: Check out code
4038
uses: actions/checkout@v4
4139
- name: Install Chef
42-
uses: actionshub/[email protected].0
40+
uses: actionshub/[email protected].1
4341
- name: Dokken
4442
uses: actionshub/[email protected]
4543
env:

CHANGELOG.md

+2
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ This file is used to list changes made in each version of the yum-elrepo cookboo
44

55
## Unreleased
66

7+
- Add new v2 GPG key
8+
79
## 2.2.10 - *2024-05-03*
810

911
## 2.2.9 - *2024-05-03*

attributes/elrepo.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
default['yum']['elrepo']['mirrorlist'] = "https://elrepo.org/mirrors-elrepo.el#{yum_elrepo_release}"
22
default['yum']['elrepo']['description'] = "ELRepo.org Community Enterprise Linux Repository - el#{yum_elrepo_release}"
3-
default['yum']['elrepo']['gpgkey'] = 'https://elrepo.org/RPM-GPG-KEY-elrepo.org'
3+
default['yum']['elrepo']['gpgkey'] = 'https://elrepo.org/RPM-GPG-KEY-elrepo.org https://www.elrepo.org/RPM-GPG-KEY-v2-elrepo.org'
44
default['yum']['elrepo']['enabled'] = true

attributes/extras.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
default['yum']['elrepo-extras']['mirrorlist'] = "https://elrepo.org/mirrors-elrepo-extras.el#{yum_elrepo_release}"
22
default['yum']['elrepo-extras']['description'] = "ELRepo.org Community Enterprise Linux Extras Repository - el#{yum_elrepo_release}"
3-
default['yum']['elrepo-extras']['gpgkey'] = 'https://elrepo.org/RPM-GPG-KEY-elrepo.org'
3+
default['yum']['elrepo-extras']['gpgkey'] = 'https://elrepo.org/RPM-GPG-KEY-elrepo.org https://www.elrepo.org/RPM-GPG-KEY-v2-elrepo.org'
44
default['yum']['elrepo-extras']['enabled'] = true

attributes/kernel.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
default['yum']['elrepo-kernel']['mirrorlist'] = "https://elrepo.org/mirrors-elrepo-kernel.el#{yum_elrepo_release}"
22
default['yum']['elrepo-kernel']['description'] = "ELRepo.org Community Enterprise Linux Kernel Repository - el#{yum_elrepo_release}"
3-
default['yum']['elrepo-kernel']['gpgkey'] = 'https://elrepo.org/RPM-GPG-KEY-elrepo.org'
3+
default['yum']['elrepo-kernel']['gpgkey'] = 'https://elrepo.org/RPM-GPG-KEY-elrepo.org https://www.elrepo.org/RPM-GPG-KEY-v2-elrepo.org'
44
default['yum']['elrepo-kernel']['enabled'] = true

attributes/testing.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
default['yum']['elrepo-testing']['mirrorlist'] = "https://elrepo.org/mirrors-elrepo-testing.el#{yum_elrepo_release}"
22
default['yum']['elrepo-testing']['description'] = "ELRepo.org Community Enterprise Linux Testing Repository - el#{yum_elrepo_release}"
3-
default['yum']['elrepo-testing']['gpgkey'] = 'https://elrepo.org/RPM-GPG-KEY-elrepo.org'
3+
default['yum']['elrepo-testing']['gpgkey'] = 'https://elrepo.org/RPM-GPG-KEY-elrepo.org https://www.elrepo.org/RPM-GPG-KEY-v2-elrepo.org'
44
default['yum']['elrepo-testing']['enabled'] = true

spec/spec_helper.rb

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@
55
config.color = true # Use color in STDOUT
66
config.formatter = :documentation # Use the specified formatter
77
config.log_level = :error # Avoid deprecation notice SPAM
8-
config.platform = 'centos'
9-
config.version = '7'
8+
config.platform = 'almalinux'
9+
config.version = '9'
1010
end

test/integration/default/default_spec.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,6 @@
3232
).each do |repo|
3333
describe ini("/etc/yum.repos.d/#{repo}.repo") do
3434
its("#{repo}.gpgcheck") { should cmp 1 }
35-
its("#{repo}.gpgkey") { should cmp 'https://elrepo.org/RPM-GPG-KEY-elrepo.org' }
35+
its("#{repo}.gpgkey") { should cmp 'https://elrepo.org/RPM-GPG-KEY-elrepo.org https://www.elrepo.org/RPM-GPG-KEY-v2-elrepo.org' }
3636
end
3737
end

0 commit comments

Comments
 (0)