Skip to content

Commit ff74d6e

Browse files
committed
logind_idle_timeout: use dropin files in RHEL 10 as well
1 parent 8889ba5 commit ff74d6e

4 files changed

Lines changed: 5 additions & 5 deletions

File tree

linux_os/guide/system/accounts/accounts-physical/logind_session_timeout/ansible/shared.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
{{{ ansible_instantiate_variables("var_logind_session_timeout") }}}
88

9-
{{% if product in ["rhel9", "sle15", "sle16"] %}}
9+
{{% if product in ["rhel9", "rhel10", "sle15", "sle16"] %}}
1010
# create drop-in in the /etc/systemd/logind.conf.d/ directory
1111
{{% set logind_conf_file = "/etc/systemd/logind.conf.d/oscap-idle-sessions.conf" %}}
1212
{{% else %}}

linux_os/guide/system/accounts/accounts-physical/logind_session_timeout/bash/shared.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
{{{ bash_instantiate_variables("var_logind_session_timeout") }}}
44

5-
{{% if product in ["rhel9", "sle15", "sle16"] %}}
5+
{{% if product in ["rhel9", "rhel10", "sle15", "sle16"] %}}
66
# create drop-in in the /etc/systemd/logind.conf.d/ directory
77
{{% set logind_conf_file = "/etc/systemd/logind.conf.d/oscap-idle-sessions.conf" %}}
88
{{% else %}}

linux_os/guide/system/accounts/accounts-physical/logind_session_timeout/oval/shared.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
{{% if product in ["rhel9", "sle15", "sle16"] %}}
1+
{{% if product in ["rhel9", "rhel10", "sle15", "sle16"] %}}
22
{{% set logind_conf_file = "/etc/systemd/logind.conf.d/" %}}
33
{{% else %}}
44
{{% set logind_conf_file = "/etc/systemd/logind.conf" %}}
55
{{% endif %}}
66

77
<def-group>
88
<definition class="compliance" id="logind_session_timeout" version="1">
9-
{{% if product in ["rhel9", "sle15", "sle16"] %}}
9+
{{% if product in ["rhel9", "rhel10", "sle15", "sle16"] %}}
1010
{{{ oval_metadata("Ensure 'StopIdleSessionSec' is configured with desired value in section 'Login' in {{{ logind_conf_file }}}", rule_title=rule_title) }}}
1111
<criteria comment="logind is configured correctly and configuration file exists" operator="AND">
1212
<criterion comment="Check the StopIdleSessionSec in {{{ logind_conf_file }}}" test_ref="test_logind_session_timeout_drop_in"/>

linux_os/guide/system/accounts/accounts-physical/logind_session_timeout/tests/common.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# this file prepares unified test environment used by other scenarios
44
# These should be tuned per product to match defaults
55

6-
{{% if product in ["rhel9", "sle15", "sle16"] %}}
6+
{{% if product in ["rhel9", "rhel10", "sle15", "sle16"] %}}
77
LOGIND_CONF_FILE="/etc/systemd/logind.conf.d/oscap-idle-sessions.conf"
88
mkdir -p /etc/systemd/logind.conf.d/
99
{{% else %}}

0 commit comments

Comments
 (0)