Merge pull request #12312 from yuumasato/fix_chronyd_remote_server_di…

…r_path_regex Fix chronyd remote server filepath dir regex
ComplianceAsCode · Aug 19, 2024 · d484bc7 · d484bc7
2 parents e186984 + 9185aee
commit d484bc7
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/linux_os/guide/services/ntp/chronyd_specify_remote_server/oval/shared.xml b/linux_os/guide/services/ntp/chronyd_specify_remote_server/oval/shared.xml
@@ -15,7 +15,7 @@
 
   <ind:textfilecontent54_object comment="Ensure at least one NTP server is set"
   id="object_chronyd_remote_server" version="1">
-    <ind:filepath operation="pattern match">^({{{ chrony_conf_path }}}|{{{ chrony_d_path }}}/.+\.conf)$</ind:filepath>
+    <ind:filepath operation="pattern match">^({{{ chrony_conf_path }}}|{{{ chrony_d_path }}}.+\.conf)$</ind:filepath>
     <ind:pattern operation="pattern match">^[\s]*(?:server|pool)[\s]+.+$</ind:pattern>
     <ind:instance datatype="int">1</ind:instance>
   </ind:textfilecontent54_object>

diff --git a/products/debian12/product.yml b/products/debian12/product.yml
@@ -20,7 +20,7 @@ init_system: "systemd"
 oval_feed_url: "https://www.debian.org/security/oval/oval-definitions-bookworm.xml.bz2"
 
 chrony_conf_path: "/etc/chrony/chrony.conf"
-chrony_d_path: "/etc/chrony/chrony.d"
+chrony_d_path: "/etc/chrony/chrony.d/"
 
 cpes_root: "../../shared/applicability"
 cpes:

diff --git a/tests/data/product_stability/debian12.yml b/tests/data/product_stability/debian12.yml
@@ -8,7 +8,7 @@ basic_properties_derived: true
 benchmark_id: DEBIAN-12
 benchmark_root: ../../linux_os/guide
 chrony_conf_path: /etc/chrony/chrony.conf
-chrony_d_path: /etc/chrony/chrony.d
+chrony_d_path: /etc/chrony/chrony.d/
 cpes:
 - debian12:
     check_id: installed_OS_is_debian12