-
Notifications
You must be signed in to change notification settings - Fork 38
Re-enable gpgchecks for dnf packages (where public keys are available) #873
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
Draft
bertiethorpe
wants to merge
21
commits into
main
Choose a base branch
from
feat/ark-eessi-cvmfs-config
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+330
−31
Draft
Changes from all commits
Commits
Show all changes
21 commits
Select commit
Hold shift + click to select a range
d60aadd
add eessi cvmfs config and re-enable gpg checks everywhere
bertiethorpe 7906cfb
disable fail2ban gpg check provisionally
bertiethorpe 8c10edf
Install epel-release gpg for rocky 8
bertiethorpe 934b605
gpg check option correction
bertiethorpe 32ec33e
manual dl and install of epel-release key
bertiethorpe d6e0f26
correct epel-release signing key
bertiethorpe 0c1c9ce
dnf install rocky-gpg-keys
bertiethorpe 072fd9f
stop using rpm_key module for rockyofficial key
bertiethorpe 6d29a43
test timestamps setting gpgkey
bertiethorpe 3eef4a4
hardcode ceph key in dnf_repos defaults
bertiethorpe 3707dcb
preserve ceph key newlines
bertiethorpe bf1b654
disable gpg checks for ceph repo packages
bertiethorpe 7fb0d02
rocky 8/9 compatibility chnages
bertiethorpe b997ad2
correct epel gpg key in timestamps
bertiethorpe 0789ea5
import EPEL key
bertiethorpe 00bc2db
hardcode cernvm gpg key
bertiethorpe 66af4cc
disable gpgcheck for cvmfs eessi config (not provided upstream)
bertiethorpe 0202da7
disable gpgchecks for some repos provisionally
bertiethorpe 535242f
Merge branch 'main' into feat/ark-eessi-cvmfs-config
bertiethorpe 89fdeac
Bump CI images
bertiethorpe 5ab236f
move dnf_repos gpg key imports to top, consistent gpgchecks, comments
bertiethorpe File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,34 +1,22 @@ | ||
| --- | ||
|
|
||
| - name: Download Cern GPG key | ||
| # checkov:skip=CKV2_ANSIBLE_2: "Ensure that HTTPS url is used with get_url" | ||
| ansible.builtin.get_url: | ||
| url: https://cvmrepo.web.cern.ch/cvmrepo/yum/RPM-GPG-KEY-CernVM-2048 | ||
| dest: ./cvmfs-key.gpg | ||
| checksum: "{{ cvmfs_gpg_checksum }}" | ||
| mode: "0644" | ||
| - name: Install CVMFS GPG key | ||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. So what's different here vs e.g. openhpc where we install/import the key as part as of the dnf_repos role? |
||
| ansible.builtin.copy: | ||
| content: "{{ cvmfs_gpg_key }}" | ||
| dest: /etc/pki/rpm-gpg/RPM-GPG-KEY-CernVM | ||
| owner: root | ||
| group: root | ||
| mode: '0644' | ||
|
|
||
| - name: Import downloaded GPG key # noqa: no-changed-when | ||
| ansible.builtin.command: rpm --import cvmfs-key.gpg # noqa: command-instead-of-module | ||
| - name: Import CVMFS GPG key # noqa: no-changed-when | ||
| ansible.builtin.command: rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CernVM # noqa: command-instead-of-module | ||
|
|
||
| # cvmfs repo provided by dnf_repos role | ||
| # cvmfs repo and eessi config provided by dnf_repos role | ||
|
|
||
| - name: Install CVMFS | ||
| ansible.builtin.dnf: | ||
| name: cvmfs | ||
|
|
||
| - name: Install EESSI CVMFS config | ||
| # checkov:skip=CKV2_ANSIBLE_4: "Ensure that packages with untrusted or missing GPG signatures are not used by dnf" | ||
| ansible.builtin.dnf: | ||
| name: https://github.com/EESSI/filesystem-layer/releases/download/latest/cvmfs-config-eessi-latest.noarch.rpm | ||
| # NOTE: Can't find any docs on obtaining gpg key - maybe downloading directly from github is ok? | ||
| disable_gpg_check: true | ||
|
|
||
| # Alternative version using official repo - still no GPG key :( | ||
| # - name: Add EESSI repo | ||
| # ansible.builtin.dnf: | ||
| # name: http://repo.eessi-infra.org/eessi/rhel/8/noarch/eessi-release-0-1.noarch.rpm | ||
|
|
||
| # - name: Install EESSI CVMFS config | ||
| # ansible.builtin.dnf: | ||
| # name: cvmfs-config-eessi | ||
| name: cvmfs-config-eessi | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If gpgkey isn't provided and gpgcheck is true, that should be an error I think to avoid hard-to-diagnose errors later?