Ubuntu 24.04: Implement 2.3.1.1 Ensure a single time synchronization daemon is in use

components/ntp.yml

@@ -28,9 +28,11 @@ rules:
 - package_timesyncd_installed
 - package_timesyncd_removed
 - service_chronyd_enabled
+- service_chronyd_disabled
 - service_chronyd_or_ntpd_enabled
 - service_ntp_enabled
 - service_ntpd_enabled
 - service_timesyncd_enabled
+- service_timesyncd_disabled
 - service_timesyncd_configured
 - service_timesyncd_root_distance_configured

controls/cis_ubuntu2404.yml

@@ -939,12 +939,11 @@ controls:
     levels:
       - l1_server
       - l1_workstation
-    related_rules:
+    rules:
       - package_chrony_installed
-      - package_ntp_installed
-      - package_timesyncd_installed
-    status: planned
-    notes: TODO. Partial/incorrect implementation exists.See related rules. Analogous to ubuntu2204/2.1.1.1.
+      - service_chronyd_enabled
+      - service_timesyncd_disabled
+    status: automated
 
   - id: 2.3.2.1
     title: Ensure systemd-timesyncd configured with authorized timeserver (Automated)

linux_os/guide/services/ntp/service_chronyd_disabled/rule.yml

@@ -0,0 +1,23 @@
+documentation_complete: true
+
+title: 'The Chronyd service is disabled'
+
+description: |-
+    {{{ describe_service_disable(service="chrony") }}}
+
+rationale: |-
+    Disabling the <tt>chrony</tt> service ensures that there is
+    only single one time service running.
+
+severity: medium
+
+platform: package[chrony]
+
+template:
+    name: service_disabled
+    vars:
+        packagename: chrony
+        servicename: chronyd
+        servicename@ubuntu2004: chrony
+        servicename@ubuntu2204: chrony
+        servicename@debian12: chrony

linux_os/guide/services/ntp/service_timesyncd_disabled/rule.yml

@@ -0,0 +1,25 @@
+documentation_complete: true
+
+
+title: 'Disable systemd_timesyncd Service'
+
+description: |-
+    {{{ describe_service_disable(service="systemd_timesyncd") }}}
+
+rationale: |-
+    Disabling the <tt>systemd_timesyncd</tt> service ensures that there is
+    only single one time service running.
+    <br /><br />
+    Additional information on Ubuntu network time protocol is
+    available at
+    {{{ weblink(link="https://ubuntu.com/server/docs/about-time-synchronisation") }}}.
+
+severity: medium
+
+platform: package[chrony] or package[ntp]
+
+template:
+    name: service_disabled
+    vars:
+        servicename: systemd-timesyncd
+        packagename: systemd