From c65e7261341054c5236d57d1fb060cbb40b2eaa8 Mon Sep 17 00:00:00 2001
From: Watson Sato <wsato@redhat.com>
Date: Wed, 13 Oct 2021 14:43:12 +0200
Subject: [PATCH 1/2] Add rsyslog tls config rules to rhel7
---
.../rsyslog_sending_messages/rsyslog_remote_tls/rule.yml | 2 +-
.../rsyslog_sending_messages/rsyslog_remote_tls_cacert/rule.yml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/linux_os/guide/system/logging/rsyslog_sending_messages/rsyslog_remote_tls/rule.yml b/linux_os/guide/system/logging/rsyslog_sending_messages/rsyslog_remote_tls/rule.yml
index 9f30722a502..8cb1ad210ff 100644
--- a/linux_os/guide/system/logging/rsyslog_sending_messages/rsyslog_remote_tls/rule.yml
+++ b/linux_os/guide/system/logging/rsyslog_sending_messages/rsyslog_remote_tls/rule.yml
@@ -1,6 +1,6 @@
documentation_complete: true
-prodtype: fedora,ol8,rhel8,rhel9
+prodtype: fedora,ol8,rhel7,rhel8,rhel9
title: 'Configure TLS for rsyslog remote logging'
diff --git a/linux_os/guide/system/logging/rsyslog_sending_messages/rsyslog_remote_tls_cacert/rule.yml b/linux_os/guide/system/logging/rsyslog_sending_messages/rsyslog_remote_tls_cacert/rule.yml
index 0765a5dbd78..bf01f770fc2 100644
--- a/linux_os/guide/system/logging/rsyslog_sending_messages/rsyslog_remote_tls_cacert/rule.yml
+++ b/linux_os/guide/system/logging/rsyslog_sending_messages/rsyslog_remote_tls_cacert/rule.yml
@@ -1,6 +1,6 @@
documentation_complete: true
-prodtype: fedora,ol8,rhel8,rhel9
+prodtype: fedora,ol8,rhel7,rhel8,rhel9
title: 'Configure CA certificate for rsyslog remote logging'
From 29231a3f95f2ba435f3fd6791fedd0d339b85ae9 Mon Sep 17 00:00:00 2001
From: Watson Sato <wsato@redhat.com>
Date: Wed, 13 Oct 2021 16:50:18 +0200
Subject: [PATCH 2/2] Add RHEL-7 CCEs to rsyslog rules
---
.../rsyslog_sending_messages/rsyslog_remote_tls/rule.yml | 1 +
.../rsyslog_sending_messages/rsyslog_remote_tls_cacert/rule.yml | 1 +
shared/references/cce-redhat-avail.txt | 2 --
3 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/linux_os/guide/system/logging/rsyslog_sending_messages/rsyslog_remote_tls/rule.yml b/linux_os/guide/system/logging/rsyslog_sending_messages/rsyslog_remote_tls/rule.yml
index 8cb1ad210ff..d5d49bf7426 100644
--- a/linux_os/guide/system/logging/rsyslog_sending_messages/rsyslog_remote_tls/rule.yml
+++ b/linux_os/guide/system/logging/rsyslog_sending_messages/rsyslog_remote_tls/rule.yml
@@ -21,6 +21,7 @@ rationale: |-
severity: medium
identifiers:
+ cce@rhel7: CCE-89194-5
cce@rhel8: CCE-82457-3
cce@rhel9: CCE-83991-0
diff --git a/linux_os/guide/system/logging/rsyslog_sending_messages/rsyslog_remote_tls_cacert/rule.yml b/linux_os/guide/system/logging/rsyslog_sending_messages/rsyslog_remote_tls_cacert/rule.yml
index bf01f770fc2..635207b571f 100644
--- a/linux_os/guide/system/logging/rsyslog_sending_messages/rsyslog_remote_tls_cacert/rule.yml
+++ b/linux_os/guide/system/logging/rsyslog_sending_messages/rsyslog_remote_tls_cacert/rule.yml
@@ -20,6 +20,7 @@ rationale: |-
severity: medium
identifiers:
+ cce@rhel7: CCE-89253-9
cce@rhel8: CCE-82458-1
cce@rhel9: CCE-83992-8
diff --git a/shared/references/cce-redhat-avail.txt b/shared/references/cce-redhat-avail.txt
index 3b34abfdf25..78d877a306e 100644
--- a/shared/references/cce-redhat-avail.txt
+++ b/shared/references/cce-redhat-avail.txt
@@ -3203,7 +3203,6 @@ CCE-89190-3
CCE-89191-1
CCE-89192-9
CCE-89193-7
-CCE-89194-5
CCE-89195-2
CCE-89196-0
CCE-89197-8
@@ -3262,7 +3261,6 @@ CCE-89249-7
CCE-89250-5
CCE-89251-3
CCE-89252-1
-CCE-89253-9
CCE-89254-7
CCE-89255-4
CCE-89256-2