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 Blueprint template to be self-contained #2081

Merged
merged 2 commits into from
Feb 21, 2024

Conversation

evgenyz
Copy link
Contributor

@evgenyz evgenyz commented Jan 31, 2024

Now the generated Blueprint file will be ready-to-use right after generation unless a custom data stream is used for hardening.

There are also instructions on how to adapt the Blueprint for a custom data stream.

@evgenyz evgenyz added this to the 1.3.10 milestone Jan 31, 2024
Now the generated Blueprint file will be ready-to-use right after
generation unless a custom data stream is used for hardening.

There are also instructions on how to adapt the Blueprint for
a custom data stream.
@evgenyz evgenyz self-assigned this Jan 31, 2024
@jan-cerny
Copy link
Member

@evgenyz do you plan to do a self-review?

@evgenyz
Copy link
Contributor Author

evgenyz commented Feb 6, 2024

@evgenyz do you plan to do a self-review?

Nope. It was a glitch.

@evgenyz evgenyz assigned jan-cerny and unassigned evgenyz Feb 6, 2024
@evgenyz
Copy link
Contributor Author

evgenyz commented Feb 6, 2024

Also, @comps, please take a look.

Comment on lines 1156 to 1161
"[[packages]]\n"
"name = \"scap-security-guide\"\n"
"version = \"*\"\n\n"
"[[packages]]\n"
"name = \"openscap-scanner\"\n"
"version = \"*\"\n\n",
Copy link

Choose a reason for hiding this comment

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

I probably wouldn't do this.

The target system doesn't need scap-security-guide or openscap-scanner since the changes were already applied during image creation. It might be convenient in case the admin wants to run oscap from CLI to double-check, but it unnecessarily bloats the image.

Plus it might provide confusing results if the admin used datastream = for [customizations.openscap] since the installed scap-security-guide RPM will likely have different content version.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I've removed these sections. By the time it hits downstream they won't be needed (they are implicit in the upstream of IB now).

Remove would-be-redundant to mention implicit scap-security-guide
and openscap-scanner packages.
@jan-cerny jan-cerny merged commit 7b45a7e into OpenSCAP:maint-1.3 Feb 21, 2024
18 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants