Use _guard_var templates for timesync services on Ubuntu 24.04

ComplianceAsCode · Jan 27, 2025 · 751dfc0 · 751dfc0
1 parent 8efaab3
commit 751dfc0
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 1 deletion.
diff --git a/linux_os/guide/services/ntp/service_chronyd_disabled/rule.yml b/linux_os/guide/services/ntp/service_chronyd_disabled/rule.yml
@@ -13,6 +13,15 @@ severity: medium
 
 platform: package[chrony]
 
+{{%- if product in [ "ubuntu2404" ] %}}
+template:
+    name: service_disabled_guard_var
+    vars:
+        packagename: chrony
+        servicename: chrony
+        variable: var_timesync_service
+        value: chronyd
+{{%- else %}}
 template:
     name: service_disabled
     vars:
@@ -21,3 +30,4 @@ template:
         servicename@ubuntu2004: chrony
         servicename@ubuntu2204: chrony
         servicename@debian12: chrony
+{{%- endif %}}
diff --git a/linux_os/guide/services/ntp/service_chronyd_enabled/rule.yml b/linux_os/guide/services/ntp/service_chronyd_enabled/rule.yml
@@ -41,6 +41,15 @@ fixtext: '{{{ fixtext_service_enabled(service="chronyd") }}}'
 
 srg_requirement: '{{{ srg_requirement_service_enabled(service="chronyd") }}}'
 
+{{%- if product in [ "ubuntu2404" ] %}}
+template:
+    name: service_enabled_guard_var
+    vars:
+        packagename: chrony
+        servicename: chrony
+        variable: var_timesync_service
+        value: chronyd
+{{%- else %}}
 template:
     name: service_enabled
     vars:
@@ -49,3 +58,4 @@ template:
         servicename@ubuntu2004: chrony
         servicename@ubuntu2204: chrony
         servicename@debian12: chrony
+{{%- endif %}}
diff --git a/linux_os/guide/services/ntp/service_timesyncd_disabled/rule.yml b/linux_os/guide/services/ntp/service_timesyncd_disabled/rule.yml
@@ -1,6 +1,5 @@
 documentation_complete: true
 
-
 title: 'Disable systemd_timesyncd Service'
 
 description: |-
@@ -18,8 +17,18 @@ severity: medium
 
 platform: package[systemd-timesyncd]
 
+{{%- if product in [ "ubuntu2404" ] %}}
+template:
+    name: service_disabled_guard_var
+    vars:
+        packagename: systemd-timesyncd
+        servicename: systemd-timesyncd
+        variable: var_timesync_service
+        value: systemd-timesyncd
+{{%- else %}}
 template:
     name: service_disabled
     vars:
         servicename: systemd-timesyncd
         packagename: systemd-timesyncd
+{{%- endif %}}
diff --git a/linux_os/guide/services/ntp/service_timesyncd_enabled/rule.yml b/linux_os/guide/services/ntp/service_timesyncd_enabled/rule.yml
@@ -43,8 +43,18 @@ references:
 ocil: |-
     {{{ ocil_service_enabled(service="systemd_timesyncd") }}}
 
+{{%- if product in [ "ubuntu2404" ] %}}
+template:
+    name: service_enabled_guard_var
+    vars:
+        packagename: systemd-timesyncd
+        servicename: systemd-timesyncd
+        variable: var_timesync_service
+        value: systemd-timesyncd
+{{%- else %}}
 template:
     name: service_enabled
     vars:
         servicename: systemd-timesyncd
         packagename: systemd
+{{%- endif %}}