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

Add RHEL 10 to Jinja if statements in firewalld_sshd_port_enabled #12504

Merged
merged 2 commits into from
Oct 18, 2024
Merged

Add RHEL 10 to Jinja if statements in firewalld_sshd_port_enabled #12504

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8285e42
Add RHEL 10 to Jinja if statements in firewalld_sshd_port_enabled
Mab879 Oct 16, 2024
dd341d9
Adjust rule file for firewalld_sshd_port_enabled
Mab879 Oct 17, 2024
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
4 changes: 2 additions & 2 deletions linux_os/guide/services/ssh/ssh_server/firewalld_sshd_port_enabled/oval/shared.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@

<ind:textfilecontent54_object id="object_firewalld_sshd_port_enabled_zones_assigned_to_nics"
comment="Check the respective zone parameter in all NICs configuration files" version="3">
{{% if product in ["fedora", "ol9", "rhel9"] %}}
{{% if product in ["fedora", "ol9", "rhel9", "rhel10"] %}}
<ind:path>/etc/NetworkManager/system-connections</ind:path>
<ind:filename operation="pattern match">.*\.nmconnection</ind:filename>
<ind:pattern operation="pattern match">^zone=(.*)$</ind:pattern>
Expand Down Expand Up @@ -83,7 +83,7 @@
<unix:file_object id="object_firewalld_sshd_port_enabled_network_conf_files" version="1">
<unix:behaviors recurse="directories" recurse_direction="down" max_depth="1"
recurse_file_system="all"/>
{{% if product in ["fedora", "ol9", "rhel9"] %}}
{{% if product in ["fedora", "ol9", "rhel9", "rhel10"] %}}
<unix:path>/etc/NetworkManager/system-connections</unix:path>
<unix:filename operation="pattern match">.*\.nmconnection</unix:filename>
{{% else %}}
Expand Down
2 changes: 1 addition & 1 deletion linux_os/guide/services/ssh/ssh_server/firewalld_sshd_port_enabled/rule.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ warnings:
the respective file. If the default SSH port is modified, it is on the administrator
responsibility to ensure the firewalld customizations in the service port level are
properly configured.
{{% if product in [ 'ol9', 'rhel9' ] %}}
{{% if product in [ 'fedora', 'ol9', 'rhel9', 'rhel10' ] %}}
- management: |-
{{{ full_name }}} prefers and recommends to use NetworkManager keyfiles instead of the
<tt>ifcfg</tt> files stored in <tt>/etc/sysconfig/network-scripts</tt>. Therefore, if the
Expand Down
Loading