Skip to content

22.04.18 dev#122

Merged
dodys merged 7 commits intojammyfrom
22.04.18-dev
Mar 12, 2026
Merged

22.04.18 dev#122
dodys merged 7 commits intojammyfrom
22.04.18-dev

Conversation

@mpurg
Copy link
Copy Markdown
Contributor

@mpurg mpurg commented Mar 12, 2026

Release info

  • Minor fixes and improvements to CaC content
  • Fixed benchmark version and release date in tailoring files

Changelog

  • CaC content - CIS v2.0.0:
    • Fix /var/log ownership rules to account for non-shell accounts (LP: #2142301)
    • Improve chronyd_configure_pool_and_server rule to add trailing newline (LP: #2141667)
    • Fix incorrect username parsing in file_owner template (LP: #2137602)
  • USG tool:
    • Fix benchmark version and release date in tailoring files (LP: #2142286)

mpurg added 6 commits March 12, 2026 09:49
This fixes the issue of the tailoring files (and thus report) having the
same description, version, and release_date regardless of which
benchmark they are associated with.

The benchmark version and release date are now parametrized in the
tailoring file template and replaced at build time.

Other changes:
- tailoring file templates use string.Template placeholders
- introduced 'release_date' to benchmark release metadata
- introduced 'latest_benchmark_id' to channel data
- switched to YAML BaseLoader and cast fields explicitly

(cherry picked from commit 029457b)
(cherry picked from commit b7427e0)
(cherry picked from commit bce4b37)
@mpurg mpurg marked this pull request as ready for review March 12, 2026 09:11
@mpurg mpurg requested a review from dodys March 12, 2026 09:11
@mpurg mpurg added jammy Ubuntu 22.04 release labels Mar 12, 2026
Copy link
Copy Markdown
Contributor

@dodys dodys left a comment

Choose a reason for hiding this comment

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

lgtm, thanks!

@dodys dodys merged commit c68d8a3 into jammy Mar 12, 2026
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

jammy Ubuntu 22.04 release

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants