Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

daily prod fix: add rhel8 and rhel9 prodtypes to some rules #11296

Merged
merged 8 commits into from
Nov 22, 2023
Merged

daily prod fix: add rhel8 and rhel9 prodtypes to some rules #11296

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
aa816fc
return prodtype to ntpd_specify_multiple_servers
vojtapolasek Nov 21, 2023
2cae031
return prodtype to ntpd_specify_remote_server
vojtapolasek Nov 21, 2023
71e21cf
add back prodtype and warning to service_ntp_enabled
vojtapolasek Nov 21, 2023
34f9eef
add prodtype and warning to package-audit-audispd-plugins_installed
vojtapolasek Nov 21, 2023
172b1a3
add back prodtypes to set_ipv6_loopback_traffic
vojtapolasek Nov 21, 2023
2daaaf2
add back prodtype to set_loopback_traffic
vojtapolasek Nov 21, 2023
1bd1d72
modify rhel8 and rhel9 pci-dss profiles to exclude rules which do not…
vojtapolasek Nov 21, 2023
1c077d6
display warning for service_ntp_enabled also for sle15
vojtapolasek Nov 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion linux_os/guide/services/ntp/ntpd_specify_multiple_servers/rule.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
documentation_complete: true

prodtype: fedora,ol7,ol8,rhcos4,rhel7,rhel8,rhv4,sle12,sle15
prodtype: fedora,ol7,ol8,rhcos4,rhel7,rhel8,rhel9,rhv4,sle12,sle15

title: 'Specify Additional Remote NTP Servers'

Expand Down
2 changes: 1 addition & 1 deletion linux_os/guide/services/ntp/ntpd_specify_remote_server/rule.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
documentation_complete: true

prodtype: alinux2,fedora,ol7,ol8,rhcos4,rhel7,rhel8,rhv4,sle12,sle15
prodtype: alinux2,fedora,ol7,ol8,rhcos4,rhel7,rhel8,rhel9,rhv4,sle12,sle15

title: 'Specify a Remote NTP Server'

Expand Down
9 changes: 8 additions & 1 deletion linux_os/guide/services/ntp/service_ntp_enabled/rule.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
documentation_complete: true

prodtype: debian10,debian11,debian12,sle12,sle15,ubuntu1604,ubuntu1804,ubuntu2004,ubuntu2204
prodtype: debian10,debian11,debian12,rhel8,rhel9,sle12,sle15,ubuntu1604,ubuntu1804,ubuntu2004,ubuntu2204

title: 'Enable the NTP Daemon'

Expand Down Expand Up @@ -49,3 +49,10 @@ template:
name: service_enabled
vars:
servicename: ntp

{{% if prodtype in ["rhel8", "rhel9"] %}}
marcusburghardt marked this conversation as resolved.
Show resolved Hide resolved
warnings:
- general:
The <pre>ntp</pre> package is not available in {{{ full_name }}}. Please
consider the <pre>chrony</pre> package instead.
{{% endif %}}
9 changes: 8 additions & 1 deletion linux_os/guide/system/auditing/package_audit-audispd-plugins_installed/rule.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
documentation_complete: true

prodtype: fedora,ol9,rhel9,sle12,sle15,ubuntu2004
prodtype: fedora,ol9,rhel8,rhel9,sle12,sle15,ubuntu2004

title: 'Ensure the default plugins for the audit dispatcher are Installed'

Expand Down Expand Up @@ -34,3 +34,10 @@ template:
pkgname@ubuntu1604: audispd-plugins
pkgname@ubuntu1804: audispd-plugins
pkgname@ubuntu2004: audispd-plugins

{{% if prodtype in ["rhel8", "rhel9"] %}}
warnings:
- general:
This package is not available in {{{ full_name }}}. The correct package
is called audispd-plugins.
{{% endif %}}
2 changes: 1 addition & 1 deletion ...de/system/network/network-iptables/iptables_activation/set_ipv6_loopback_traffic/rule.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
documentation_complete: true

prodtype: sle12,sle15,ubuntu2004,ubuntu2204
prodtype: rhel8,rhel9,sle12,sle15,ubuntu2004,ubuntu2204

title: 'Set configuration for IPv6 loopback traffic'

Expand Down
2 changes: 1 addition & 1 deletion ...s/guide/system/network/network-iptables/iptables_activation/set_loopback_traffic/rule.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
documentation_complete: true

prodtype: alinux2,sle12,sle15,ubuntu2004,ubuntu2204
prodtype: alinux2,rhel8,rhel9,sle12,sle15,ubuntu2004,ubuntu2204

title: 'Set configuration for loopback traffic'

Expand Down
7 changes: 7 additions & 0 deletions products/rhel8/profiles/pci-dss.profile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,10 @@ selections:
# More tests are needed to identify which rule is conflicting with rpm_verify_permissions.
# https://github.com/ComplianceAsCode/content/issues/11285
- '!rpm_verify_permissions'
# these rules does not apply to RHEL but it has to keep the prodtype for historical reasons
- '!package_audit-audispd-plugins_installed'
- '!service_ntp_enabled'
- '!ntpd_specify_remote_server'
- '!ntpd_specify_multiple_servers'
- '!set_ipv6_loopback_traffic'
- '!set_loopback_traffic'
7 changes: 7 additions & 0 deletions products/rhel9/profiles/pci-dss.profile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,10 @@ selections:
# More tests are needed to identify which rule is conflicting with rpm_verify_permissions.
# https://github.com/ComplianceAsCode/content/issues/11285
- '!rpm_verify_permissions'
# these rules does not apply to RHEL but it has to keep the prodtype for historical reasons
- '!package_audit-audispd-plugins_installed'
- '!service_ntp_enabled'
- '!ntpd_specify_remote_server'
- '!ntpd_specify_multiple_servers'
- '!set_ipv6_loopback_traffic'
- '!set_loopback_traffic'
2 changes: 0 additions & 2 deletions tests/data/profile_stability/rhel8/pci-dss.profile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ selections:
- dconf_gnome_session_idle_user_locks
- sshd_set_maxstartups
- audit_rules_time_stime
- ntpd_specify_remote_server
- accounts_password_pam_pwhistory_remember_system_auth
- service_rpcbind_disabled
- chronyd_run_as_chrony_user
Expand Down Expand Up @@ -200,7 +199,6 @@ selections:
- package_telnet_removed
- audit_sudo_log_events
- package_ypbind_removed
- ntpd_specify_multiple_servers
- dconf_gnome_screensaver_idle_activation_enabled
- sysctl_net_ipv4_tcp_syncookies
- sshd_set_max_auth_tries
Expand Down
Loading