Skip to content

Commit 459f0ab

Browse files
authored
Merge pull request #11353 from vojtapolasek/remove_obsolete_packages_from_pcidss_stabilizaton
[Stabilization] handle rules trying to remove no longer existing packages
2 parents a53ebbf + d6041d0 commit 459f0ab

File tree

10 files changed

+53
-4
lines changed

10 files changed

+53
-4
lines changed

linux_os/guide/services/obsolete/inetd_and_xinetd/package_xinetd_removed/rule.yml

+6
Original file line numberDiff line numberDiff line change
@@ -49,3 +49,9 @@ template:
4949
name: package_removed
5050
vars:
5151
pkgname: xinetd
52+
53+
{{% if product in ["rhel9"] %}}
54+
warnings:
55+
- general:
56+
The package is not available in {{{ full_name }}}.
57+
{{% endif %}}

linux_os/guide/services/obsolete/nis/package_ypbind_removed/rule.yml

+6
Original file line numberDiff line numberDiff line change
@@ -43,3 +43,9 @@ template:
4343
name: package_removed
4444
vars:
4545
pkgname: ypbind
46+
47+
{{% if product in ["rhel9"] %}}
48+
warnings:
49+
- general:
50+
The package is not available in {{{ full_name }}}.
51+
{{% endif %}}

linux_os/guide/services/obsolete/nis/package_ypserv_removed/rule.yml

+6
Original file line numberDiff line numberDiff line change
@@ -52,3 +52,9 @@ template:
5252
name: package_removed
5353
vars:
5454
pkgname: ypserv
55+
56+
{{% if product in ["rhel9"] %}}
57+
warnings:
58+
- general:
59+
The package is not available in {{{ full_name }}}.
60+
{{% endif %}}

linux_os/guide/services/obsolete/r_services/package_rsh-server_removed/rule.yml

+6
Original file line numberDiff line numberDiff line change
@@ -50,3 +50,9 @@ template:
5050
name: package_removed
5151
vars:
5252
pkgname: rsh-server
53+
54+
{{% if product in ["rhel8", "rhel9"] %}}
55+
warnings:
56+
- general:
57+
The package is not available in {{{ full_name }}}.
58+
{{% endif %}}

linux_os/guide/services/obsolete/r_services/package_rsh_removed/rule.yml

+6
Original file line numberDiff line numberDiff line change
@@ -61,3 +61,9 @@ template:
6161
pkgname@ubuntu1804: rsh-client
6262
pkgname@ubuntu2004: rsh-client
6363
pkgname@ubuntu2204: rsh-client
64+
65+
{{% if product in ["rhel8", "rhel9"] %}}
66+
warnings:
67+
- general:
68+
The package is not available in {{{ full_name }}}.
69+
{{% endif %}}

linux_os/guide/services/obsolete/talk/package_talk-server_removed/rule.yml

+6
Original file line numberDiff line numberDiff line change
@@ -33,3 +33,9 @@ template:
3333
name: package_removed
3434
vars:
3535
pkgname: talk-server
36+
37+
{{% if product in ["rhel8", "rhel9"] %}}
38+
warnings:
39+
- general:
40+
The package is not available in {{{ full_name }}}.
41+
{{% endif %}}

linux_os/guide/services/obsolete/talk/package_talk_removed/rule.yml

+6
Original file line numberDiff line numberDiff line change
@@ -43,3 +43,9 @@ template:
4343
name: package_removed
4444
vars:
4545
pkgname: talk
46+
47+
{{% if product in ["rhel8", "rhel9"] %}}
48+
warnings:
49+
- general:
50+
The package is not available in {{{ full_name }}}.
51+
{{% endif %}}

products/rhel8/profiles/pci-dss.profile

+4
Original file line numberDiff line numberDiff line change
@@ -34,3 +34,7 @@ selections:
3434
- '!set_loopback_traffic'
3535
- '!service_ntpd_enabled'
3636
- '!timer_logrotate_enabled'
37+
- '!package_talk_removed'
38+
- '!package_talk-server_removed'
39+
- '!package_rsh_removed'
40+
- '!package_rsh-server_removed'

products/rhel9/profiles/pci-dss.profile

+7
Original file line numberDiff line numberDiff line change
@@ -36,3 +36,10 @@ selections:
3636
- '!set_ipv6_loopback_traffic'
3737
- '!set_loopback_traffic'
3838
- '!service_ntpd_enabled'
39+
- '!package_ypserv_removed'
40+
- '!package_ypbind_removed'
41+
- '!package_talk_removed'
42+
- '!package_talk-server_removed'
43+
- '!package_xinetd_removed'
44+
- '!package_rsh_removed'
45+
- '!package_rsh-server_removed'

tests/data/profile_stability/rhel8/pci-dss.profile

-4
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ selections:
6565
- file_owner_etc_shadow
6666
- accounts_passwords_pam_faillock_deny
6767
- accounts_password_all_shadowed
68-
- package_talk-server_removed
6968
- accounts_root_gid_zero
7069
- selinux_state
7170
- audit_rules_time_clock_settime
@@ -85,7 +84,6 @@ selections:
8584
- network_sniffer_disabled
8685
- audit_rules_session_events
8786
- package_dhcp_removed
88-
- package_rsh_removed
8987
- file_owner_cron_d
9088
- sshd_set_idle_timeout
9189
- file_groupowner_cron_weekly
@@ -213,7 +211,6 @@ selections:
213211
- auditd_data_retention_space_left_action
214212
- rsyslog_files_permissions
215213
- file_owner_cron_monthly
216-
- package_talk_removed
217214
- file_permissions_cron_daily
218215
- selinux_confinement_of_daemons
219216
- sysctl_net_ipv4_conf_all_send_redirects
@@ -245,7 +242,6 @@ selections:
245242
- rpm_verify_hashes
246243
- file_owner_cron_allow
247244
- file_permissions_sshd_pub_key
248-
- package_rsh-server_removed
249245
- dconf_gnome_disable_automount
250246
- gid_passwd_group_same
251247
- package_xinetd_removed

0 commit comments

Comments
 (0)