Add match-logic for CentOS

While we're here, fix the cpe-dictionary.xml OS-Major value
plus3it · Jul 10, 2024 · e434f98 · e434f98
1 parent d5aa920
commit e434f98
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/ash-linux/el9/VendorSTIG/remediate.sls b/ash-linux/el9/VendorSTIG/remediate.sls
@@ -10,6 +10,8 @@
   {%- set dsos = 'rhel' %}
 {%- elif salt.grains.get('os')|lower == 'oel' %}
   {%- set dsos = 'ol' %}
+{%- elif salt.grains.get('os')|lower == 'centos stream' %}
+  {%- set dsos = 'cs' %}
 {%- else %}
   {%- set dsos = salt.grains.get('os')|lower %}
 {%- endif %}

diff --git a/ash-linux/el9/VendorSTIG/report.sls b/ash-linux/el9/VendorSTIG/report.sls
@@ -13,13 +13,15 @@
   {%- set dsos = 'rhel' %}
 {%- elif salt.grains.get('os')|lower == 'oel' %}
   {%- set dsos = 'ol' %}
+{%- elif salt.grains.get('os')|lower == 'centos stream' %}
+  {%- set dsos = 'cs' %}
 {%- else %}
   {%- set dsos = salt.grains.get('os')|lower %}
 {%- endif %}
 {%- set osrel = salt.grains.get('osmajorrelease') %}
 {%- set contentDir = '/usr/share/xml/scap/ssg/content' %}
 {%- set cpeXml = salt.pillar.get('ash-linux:lookup:scap-cpe') | default(
-    contentDir ~ '/ssg-rhel8-cpe-dictionary.xml',
+    contentDir ~ '/ssg-rhel9-cpe-dictionary.xml',
     true
 ) %}
 {%- set xccdfXml = salt.pillar.get('ash-linux:lookup:scap-xccdf') | default(