Merge pull request #11177 from Mab879/add_timer_logrotate_enabled_stable

jan-cerny · web-flow · commit 2568bef778cf · 2023-10-06T16:27:39.000+02:00
stabilization - Add timer_logrotate_enabled back to RHEL 7 and RHEL 8
diff --git a/linux_os/guide/system/logging/log_rotation/timer_logrotate_enabled/rule.yml b/linux_os/guide/system/logging/log_rotation/timer_logrotate_enabled/rule.yml
@@ -1,6 +1,6 @@
 documentation_complete: true
 
-prodtype: ol9,rhcos4,rhel9,sle12,sle15
+prodtype: ol9,rhcos4,rhel7,rhel8,rhel9,sle12,sle15
 
 title: 'Enable logrotate Timer'
 
@@ -14,7 +14,11 @@ rationale: |-
 
 severity: medium
 
+{{% if 'rhel' in product %}}
+platform: package[logrotate] and os_linux[rhel]>=9
+{{% else %}}
 platform: package[logrotate]
+{{% endif %}}
 
 identifiers:
     cce@rhel7: CCE-86156-7
diff --git a/products/rhel7/profiles/anssi_nt28_enhanced.profile b/products/rhel7/profiles/anssi_nt28_enhanced.profile
@@ -14,3 +14,4 @@ description: |-
 selections:
     - anssi:all:enhanced
     - '!selinux_state'
+    - '!timer_logrotate_enabled'
diff --git a/products/rhel7/profiles/anssi_nt28_high.profile b/products/rhel7/profiles/anssi_nt28_high.profile
@@ -13,3 +13,4 @@ description: |-
 
 selections:
     - anssi:all:high
+    - '!timer_logrotate_enabled'
diff --git a/products/rhel8/profiles/anssi_bp28_enhanced.profile b/products/rhel8/profiles/anssi_bp28_enhanced.profile
@@ -17,3 +17,4 @@ description: |-
 
 selections:
     - anssi:all:enhanced
+    - '!timer_logrotate_enabled'
diff --git a/products/rhel8/profiles/anssi_bp28_high.profile b/products/rhel8/profiles/anssi_bp28_high.profile
@@ -19,3 +19,4 @@ selections:
     - anssi:all:high
     # the following rule renders UEFI systems unbootable
     - '!sebool_secure_mode_insmod'
+    - '!timer_logrotate_enabled'

Original file line number	Diff line number	Diff line change
`@@ -13,3 +13,4 @@ description: \|-`
`13`	`13`
`14`	`14`	`selections:`
`15`	`15`	`- anssi:all:high`
	`16`	`+ - '!timer_logrotate_enabled'`
Original file line number	Diff line number	Diff line change
`@@ -17,3 +17,4 @@ description: \|-`
`17`	`17`
`18`	`18`	`selections:`
`19`	`19`	`- anssi:all:enhanced`
	`20`	`+ - '!timer_logrotate_enabled'`