From 2e89ac8ac547dd7024bdc6fbcbbc1cfbb9019374 Mon Sep 17 00:00:00 2001 From: Thomas H Jones II Date: Tue, 7 May 2024 08:19:06 -0400 Subject: [PATCH 1/2] Add stanza for EL9 --- pillar/common/scap/map.jinja | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pillar/common/scap/map.jinja b/pillar/common/scap/map.jinja index 6409cb7..59b5820 100644 --- a/pillar/common/scap/map.jinja +++ b/pillar/common/scap/map.jinja @@ -87,6 +87,17 @@ 'profile': 'xccdf_org.ssgproject.content_profile_stig' }, 'scc_source': 'https://watchmaker.cloudarmor.io/repo/spawar/scc/scc-5.7.1.rhel8.x86_64.rpm' + }, + '9': { + 'guide_patterns': [ + 'disa/stig-el' ~ grains['osmajorrelease'] ~ '-scap_1-2' + ], + 'oscap': { + 'xccdf': 'openscap/ssg-' ~ os ~ '9-xccdf.xml', + 'cpe': 'openscap/ssg-rhel9-cpe-dictionary.xml', + 'profile': 'xccdf_org.ssgproject.content_profile_stig' + }, + 'scc_source': 'https://watchmaker.cloudarmor.io/repo/spawar/scc/scc-5.9.rhel9.x86_64.rpm' } }, grain='osmajorrelease')) %} From c019f054ba2c3febfa27c8722e76a9d47fa71327 Mon Sep 17 00:00:00 2001 From: Thomas H Jones II Date: Tue, 7 May 2024 14:27:54 -0400 Subject: [PATCH 2/2] Update for SCC 5.9 --- pillar/common/scap/map.jinja | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pillar/common/scap/map.jinja b/pillar/common/scap/map.jinja index 59b5820..7ee362d 100644 --- a/pillar/common/scap/map.jinja +++ b/pillar/common/scap/map.jinja @@ -75,7 +75,7 @@ 'cpe': 'openscap/ssg-rhel7-cpe-dictionary.xml', 'profile': 'xccdf_org.ssgproject.content_profile_stig' }, - 'scc_source': 'https://watchmaker.cloudarmor.io/repo/spawar/scc/scc-5.7.1.rhel7.x86_64.rpm' + 'scc_source': 'https://watchmaker.cloudarmor.io/repo/spawar/scc/scc-5.9.rhel7.x86_64.rpm' }, '8': { 'guide_patterns': [ @@ -86,11 +86,11 @@ 'cpe': 'openscap/ssg-rhel8-cpe-dictionary.xml', 'profile': 'xccdf_org.ssgproject.content_profile_stig' }, - 'scc_source': 'https://watchmaker.cloudarmor.io/repo/spawar/scc/scc-5.7.1.rhel8.x86_64.rpm' + 'scc_source': 'https://watchmaker.cloudarmor.io/repo/spawar/scc/scc-5.9.rhel8.x86_64.rpm' }, '9': { 'guide_patterns': [ - 'disa/stig-el' ~ grains['osmajorrelease'] ~ '-scap_1-2' + 'disa/stig-el' ~ grains['osmajorrelease'] ~ '-scap_1-3' ], 'oscap': { 'xccdf': 'openscap/ssg-' ~ os ~ '9-xccdf.xml',