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

Fix Service Applicability for RHEL 9 Profiles #11367

Merged
merged 8 commits into from
Dec 11, 2023
Merged

Fix Service Applicability for RHEL 9 Profiles #11367

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
68031fa
Add squid package platform to service_squid_disabled
Mab879 Dec 8, 2023
7b1dbca
Add package telnet-server platform to service_telnet_disabled
Mab879 Dec 8, 2023
13e8634
Remove xinetd rules from HIPAA and e8 profiles on RHEL 9
Mab879 Dec 8, 2023
dea12b2
Add avahi package platform to service_avahi-daemon_disabled
Mab879 Dec 8, 2023
0656548
Remove rlogin rules from RHEL9 HIPAA profile
Mab879 Dec 8, 2023
1ce0c75
Add autofs package platform to service_autofs_disabled
Mab879 Dec 8, 2023
c723d80
Add snmpd package platform to service_snmpd_disabled
Mab879 Dec 8, 2023
6a59faf
Sort shared/applicability/package.yml
Mab879 Dec 8, 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/avahi/disable_avahi_group/service_avahi-daemon_disabled/rule.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ ocil_clause: |-
ocil: |-
{{{ ocil_service_disabled(service="avahi-daemon") }}}

platform: machine
platform: machine and package[avahi]

template:
name: service_disabled
Expand Down
2 changes: 1 addition & 1 deletion linux_os/guide/services/obsolete/telnet/service_telnet_disabled/rule.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ references:

{{{ complete_ocil_entry_socket_and_service_disabled("telnet") }}}

platform: machine
platform: machine and package[telnet-server]

warnings:
- general: |-
Expand Down
2 changes: 1 addition & 1 deletion linux_os/guide/services/proxy/disabling_squid/service_squid_disabled/rule.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ ocil_clause: |-
ocil: |-
{{{ ocil_service_disabled(service="squid") }}}

platform: machine
platform: machine and package[squid]

template:
name: service_disabled
Expand Down
3 changes: 2 additions & 1 deletion linux_os/guide/services/snmp/disabling_snmp_service/service_snmpd_disabled/rule.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,13 @@ ocil_clause: |-
ocil: |-
{{{ ocil_service_disabled(service="snmpd") }}}

platform: machine
platform: machine and package[snmpd]

template:
name: service_disabled
vars:
servicename: snmpd
packagename@debian10: snmpd
packagename@debian11: snmpd
packagename@debian12: snmpd
packagename: net-snmp
2 changes: 1 addition & 1 deletion linux_os/guide/system/permissions/mounting/service_autofs_disabled/rule.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ ocil_clause: |-
ocil: |-
{{{ ocil_service_disabled(service="autofs") }}}

platform: machine
platform: machine and package[autofs]

template:
name: service_disabled
Expand Down
2 changes: 0 additions & 2 deletions products/rhel9/profiles/e8.profile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@ selections:
### Remove obsolete packages
- package_talk_removed
- package_talk-server_removed
- package_xinetd_removed
- service_xinetd_disabled
- package_ypbind_removed
- package_telnet_removed
- service_telnet_disabled
Expand Down
4 changes: 0 additions & 4 deletions products/rhel9/profiles/hipaa.profile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,16 +42,12 @@ selections:
- sshd_disable_root_login
- libreswan_approved_tunnels
- no_rsh_trust_files
- package_rsh-server_removed
- package_talk_removed
- package_talk-server_removed
- package_telnet_removed
- package_telnet-server_removed
- package_xinetd_removed
- service_crond_enabled
- service_rlogin_disabled
- service_telnet_disabled
- service_xinetd_disabled
- use_kerberos_security_all_exports
- var_authselect_profile=sssd
- enable_authselect
Expand Down
26 changes: 22 additions & 4 deletions shared/applicability/package.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,14 @@ args:
{{% else %}}
pkgname: auditd
{{% endif %}}
autofs:
pkgname: autofs
avahi:
{{% if 'ubuntu' in product %}}
pkgname: avahi-daemon
{{% else %}}
pkgname: avahi
{{% endif %}}
bash:
pkgname: bash
chrony:
Expand All @@ -38,6 +46,8 @@ args:
{{% else %}}
pkgname: snmp
{{% endif %}}
networkmanager:
pkgname: NetworkManager
nftables:
pkgname: nftables
nss-pam-ldapd:
Expand All @@ -49,6 +59,8 @@ args:
ntp:
pkgname: ntp
title: NTP daemon and utilities
openssh:
pkgname: openssh
pam:
{{% if pkg_system == "rpm" %}}
pkgname: pam
Expand All @@ -73,6 +85,14 @@ args:
{{% else %}}
pkgname: login
{{% endif %}}
snmpd:
{{% if 'debian' in product %}}
pkgname: snmpd
{{% else %}}
pkgname: net-snmp
{{% endif %}}
squid:
pkgname: squid
sssd:
{{% if product in ["sle12", "sle15"] %}}
pkgname: sssd
Expand All @@ -83,6 +103,8 @@ args:
pkgname: sudo
systemd:
pkgname: systemd
telnet-server:
pkgname: telnet-server
tftp-server:
pkgname: tftp-server
tmux:
Expand All @@ -95,7 +117,3 @@ args:
pkgname: yum
zypper:
pkgname: zypper
openssh:
pkgname: openssh
networkmanager:
pkgname: NetworkManager
Loading