Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(map.jinja): GPG KEY for EPEL-8 #61

Merged
merged 1 commit into from
Dec 25, 2020

Conversation

itscaro
Copy link
Contributor

@itscaro itscaro commented Dec 22, 2020

The checksum is correct but the url is wrong.

Since I cannot find the key URL in txt format I switch to use the keys from download.fedoraproject.org instead.

Fixes #58

PR progress checklist (to be filled in by reviewers)

  • Changes to documentation are appropriate (or tick if not required)
  • Changes to tests are appropriate (or tick if not required)
  • Reviews completed

What type of PR is this?

Primary type

  • [build] Changes related to the build system
  • [chore] Changes to the build process or auxiliary tools and libraries such as documentation generation
  • [ci] Changes to the continuous integration configuration
  • [feat] A new feature
  • [fix] A bug fix
  • [perf] A code change that improves performance
  • [refactor] A code change that neither fixes a bug nor adds a feature
  • [revert] A change used to revert a previous commit
  • [style] Changes that do not affect the meaning of the code (white-space, formatting, missing semi-colons, etc.)

Secondary type

  • [docs] Documentation changes
  • [test] Adding missing or correcting existing tests

Does this PR introduce a BREAKING CHANGE?

No.

Related issues and/or pull requests

Describe the changes you're proposing

Pillar / config required to test the proposed changes

Debug log showing how the proposed changes work

Documentation checklist

  • Updated the README (e.g. Available states).
  • Updated pillar.example.

Testing checklist

  • Included in Kitchen (i.e. under state_top).
  • Covered by new/existing tests (e.g. InSpec, Serverspec, etc.).
  • Updated the relevant test pillar.

Additional context

@itscaro itscaro marked this pull request as draft December 22, 2020 23:30
@itscaro itscaro changed the title fix(map.jinja): checksum GPG KEY for EPEL-8 fix(map.jinja): GPG KEY for EPEL-8 Dec 22, 2020
epel/map.jinja Outdated
'key_hash': 'sha256=22f25ad95d5e8d371760815485dba696ea3002fc2c7f812f2c75276853387107',
'key_name': 'RPM-GPG-KEY-EPEL-7',
'rpm': 'http://download.fedoraproject.org/pub/epel/7/x86_64/Packages/e/epel-release-7-13.noarch.rpm',
},
8: {
'key': 'https://fedoraproject.org/static/352C64E5.txt',
'key': 'https://download.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-8',
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The PR is to correct this GPG key, which is EPEL 7 instead of EPEL 8

@itscaro itscaro marked this pull request as ready for review December 23, 2020 09:21
epel/map.jinja Outdated
Comment on lines 36 to 37
'key': 'https://download.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-7',
'key_hash': 'sha256=028b9accc59bab1d21f2f3f544df5469910581e728a64fd8c411a725a82300c2',
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

gpg --with-fingerprint 352C64E5.txt
pub  4096R/352C64E5 2013-12-16 Fedora EPEL (7) <epel@fedoraproject.org>
      Key fingerprint = 91E9 7D7C 4A5E 96F1 7F3E  888F 6A2F AEA2 352C 64E5
gpg --with-fingerprint RPM-GPG-KEY-EPEL-7
pub  4096R/352C64E5 2013-12-16 Fedora EPEL (7) <epel@fedoraproject.org>
      Key fingerprint = 91E9 7D7C 4A5E 96F1 7F3E  888F 6A2F AEA2 352C 64E5

@myii myii requested a review from ixs December 23, 2020 09:37
@myii
Copy link
Member

myii commented Dec 23, 2020

Thanks for working through the links, @itscaro. I'd like to get a review from @ixs who had a big part in setting up the original structure of this file. It make take some time because of the holidays but if you don't hear from us, please feel free to ping me.

@ixs
Copy link
Contributor

ixs commented Dec 23, 2020

Thank you @myii. I had a quick look:

The change looks generally good and coincidentally is very similar to what I had locally but forgot to issue a PR for. 🤦🏻‍♂️
The SHA256SUM also looks good and is due to different representation of the GPG key on the fedoraproject site vs. the download site.

There's just one thing I'd like you to fix before approving. Please change the links from https://download.fedoraproject.org/ to https://dl.fedoraproject.org/.

The downloads vhost is serving a redirect to the mirror network. The dl vhost is the canonical master server. For something like the GPG signing key I'd prefer the canonical master without any mirrors in between that might break things in unexpected ways.

epel/map.jinja Outdated Show resolved Hide resolved
epel/map.jinja Outdated Show resolved Hide resolved
epel/map.jinja Outdated Show resolved Hide resolved
epel/map.jinja Outdated Show resolved Hide resolved
@myii
Copy link
Member

myii commented Dec 23, 2020

Really appreciate the prompt review, @ixs. Excellent feedback, too.

Signed-off-by: Minh-Quan TRAN <account@itscaro.me>
Copy link
Contributor

@ixs ixs left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@itscaro Thank you very much. Looks good.

@itscaro
Copy link
Contributor Author

itscaro commented Dec 25, 2020

@ixs Thank you for the feedback, I switch to dl.fedoraproject.org :-)

Happy holidays!

@ixs
Copy link
Contributor

ixs commented Dec 25, 2020

@itscaro merry christmas or whatever floats your sled. 😂

@myii myii merged commit 1981341 into saltstack-formulas:master Dec 25, 2020
@myii
Copy link
Member

myii commented Dec 25, 2020

A nice, tidy PR -- thanks guys! Merged.

@saltstack-formulas-travis

🎉 This PR is included in version 1.15.4 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[BUG] EPEL is not getting installed in rhel 8
4 participants