Merge branch 'main' of https://github.com/mitre/redhat-enterprise-lin…

…ux-8-stig-baseline into chrony_conf_adjust
mitre · Jan 13, 2025 · f31d91b · f31d91b
2 parents ae5b126 + 4b03e27
commit f31d91b
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 9 deletions.
diff --git a/.github/workflows/verify-container.yml b/.github/workflows/verify-container.yml
@@ -83,9 +83,9 @@ jobs:
 
       - name: Save Test Result JSON
         if: ${{ !contains(steps.commit.outputs.message, 'only-validate-profile') }}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: ${{ github.workflow }}-${{ env.COMMIT_SHORT_SHA }}-results
+          name: ${{ github.workflow }}-${{ env.COMMIT_SHORT_SHA }}-${{ matrix.suite }}-results
           path: spec/results/
 
       - name: Upload ${{ matrix.suite }} to Heimdall

diff --git a/.github/workflows/verify-disa-hardened-ec2.yml b/.github/workflows/verify-disa-hardened-ec2.yml
@@ -82,9 +82,9 @@ jobs:
 
       - name: Save Test Result JSON
         if: ${{ !contains(steps.commit.outputs.message, 'only-validate-profile') }}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: ${{ github.workflow }}-${{ env.COMMIT_SHORT_SHA }}-results
+          name: ${{ github.workflow }}-${{ env.COMMIT_SHORT_SHA }}-${{ matrix.suite }}-results
           path: spec/results/
 
       - name: Upload ${{ matrix.suite }} to Heimdall

diff --git a/.github/workflows/verify-ec2.yml b/.github/workflows/verify-ec2.yml
@@ -83,9 +83,9 @@ jobs:
 
       - name: Save Test Result JSON
         if: ${{ !contains(steps.commit.outputs.message, 'only-validate-profile') }}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: ${{ github.workflow }}-${{ env.COMMIT_SHORT_SHA }}-results
+          name: ${{ github.workflow }}-${{ env.COMMIT_SHORT_SHA }}-${{ matrix.suite }}-results
           path: spec/results/
 
       - name: Upload ${{ matrix.suite }} to Heimdall

diff --git a/.github/workflows/verify-rhel-official-hardened-ec2.yml b/.github/workflows/verify-rhel-official-hardened-ec2.yml
@@ -82,9 +82,9 @@ jobs:
 
       - name: Save Test Result JSON
         if: ${{ !contains(steps.commit.outputs.message, 'only-validate-profile') }}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: ${{ github.workflow }}-${{ env.COMMIT_SHORT_SHA }}-results
+          name: ${{ github.workflow }}-${{ env.COMMIT_SHORT_SHA }}-${{ matrix.suite }}-results
           path: spec/results/
 
       - name: Upload ${{ matrix.suite }} to Heimdall

diff --git a/controls/SV-230247.rb b/controls/SV-230247.rb
@@ -39,9 +39,11 @@
     !virtualization.system.eql?('docker')
   }
 
+  var_log_messages_group = input('var_log_messages_group')
+
   describe.one do
     describe file('/var/log/messages') do
-      its('group') { should be_in input('var_log_messages_group') }
+      its('group') { should be_in var_log_messages_group }
     end
     describe file('/var/log/messages') do
       it { should_not exist }