Use new template for firewall package/service rules on Ubuntu 24.04

This change modifies the firewall package/service rules to use the templates
`..._guard_var` introduced in ComplianceAsCode#11818 to selectively install the firewall
that is chosen by the var_network_filtering_service

It also fixes the platform applicability on Ubuntu 24.04 since it
both required firewalld and required that conflicting services
be disabled when installing packages. This interfered with the
logic introduced in the new templates and could result in a
package/service not be installed/enabled.

For example, if the user selected 'nftables' as their firewall
using the new template and variable, the rule package_nftables_installed
would still be marked as not applicable because the ufw service is enabled
by default on some installations. The proposed solution removes the
applicability check and installs the package depending only on the choice of
var_network_filtering_service, irrespective of the status of the ufw service.

linux_os/guide/system/network/network-iptables/package_iptables_installed/rule.yml

@@ -36,7 +36,7 @@ ocil_clause: 'the package is not installed'
 
 ocil: '{{{ ocil_package(package="iptables") }}}'
 
-{{%- if product in [ "sle12", "sle15" ] %}}
+{{%- if product in [ "sle12", "sle15", "ubuntu2404" ] %}}
 template:
     name: package_installed_guard_var
     vars:

linux_os/guide/system/network/network-nftables/package_nftables_installed/rule.yml

@@ -1,6 +1,5 @@
 documentation_complete: true
 
-
 title: 'Install nftables Package'
 
 description: |-
@@ -36,10 +35,19 @@ ocil: '{{{ ocil_package(package="nftables") }}}'
 
 platform: system_with_kernel and service_disabled[iptables] and service_disabled[ufw]
 
+{{%- if product in [ "ubuntu2404" ] %}}
+template:
+    name: package_installed_guard_var
+    vars:
+        pkgname: nftables
+        variable: var_network_filtering_service
+        value: nftables
+{{%- else %}}
 template:
     name: package_installed
     vars:
         pkgname: nftables
+{{%- endif %}}
 
 fixtext: |-
     {{{ describe_package_install(package="nftables") }}}

linux_os/guide/system/network/network-nftables/service_nftables_disabled/rule.yml

@@ -1,6 +1,5 @@
 documentation_complete: true
 
-
 title: 'Verify nftables Service is Disabled'
 
 description: |-
@@ -38,7 +37,7 @@ fixtext: '{{{ fixtext_service_disabled("nftables") }}}'
 
 platform: system_with_kernel and package[nftables] and package[firewalld]
 
-{{%- if product in [ "sle12", "sle15" ] %}}
+{{%- if product in [ "sle12", "sle15", "ubuntu2404" ] %}}
 template:
     name: service_disabled_guard_var
     vars:

linux_os/guide/system/network/network-nftables/service_nftables_enabled/rule.yml

@@ -1,6 +1,5 @@
 documentation_complete: true
 
-
 title: 'Verify nftables Service is Enabled'
 
 description: |-
@@ -34,11 +33,9 @@ ocil: |-
 fixtext: |-
     {{{ fixtext_service_enabled("nftables") }}}
 
-
 platform: system_with_kernel and package[nftables] and service_disabled[firewalld]
 
-
-{{%- if product in [ "sle12", "sle15" ] %}}
+{{%- if product in [ "sle12", "sle15", "ubuntu2404" ] %}}
 template:
     name: service_enabled_guard_var
     vars:

linux_os/guide/system/network/network-ufw/package_ufw_installed/rule.yml

@@ -1,6 +1,5 @@
 documentation_complete: true
 
-
 title: 'Install ufw Package'
 
 description: |-
@@ -25,7 +24,17 @@ ocil_clause: 'the package is not installed'
 
 ocil: '{{{ ocil_package(package="ufw") }}}'
 
+{{%- if product in [ "ubuntu2404" ] %}}
+template:
+    name: package_installed_guard_var
+    vars:
+        pkgname: ufw
+        variable: var_network_filtering_service
+        value: ufw
+        operation: pattern match
+{{%- else %}}
 template:
     name: package_installed
     vars:
         pkgname: ufw
+{{%- endif %}}

linux_os/guide/system/network/network-ufw/package_ufw_removed/rule.yml

@@ -1,6 +1,5 @@
 documentation_complete: true
 
-
 title: 'Remove ufw Package'
 
 description: |-
@@ -20,10 +19,21 @@ ocil_clause: 'the package is installed'
 
 ocil: '{{{ ocil_package(package="ufw") }}}'
 
+platform: system_with_kernel
+
+{{%- if product in [ "ubuntu2404" ] %}}
+template:
+    name: package_removed_guard_var
+    vars:
+        pkgname: ufw
+        variable: var_network_filtering_service
+        value: ufw
+{{%- else %}}
 template:
     name: package_removed
     vars:
         pkgname: ufw
+{{%- endif %}}
 
 fixtext: |-
     {{{ describe_package_remove(package="ufw") }}}

linux_os/guide/system/network/network-ufw/service_ufw_enabled/rule.yml

@@ -23,9 +23,19 @@ ocil_clause: 'the service is not enabled'
 ocil: |-
     {{{ ocil_service_enabled(service="ufw") }}}
 
+platform: system_with_kernel and package[ufw]
+
+{{%- if product in [ "ubuntu2404" ] %}}
+template:
+    name: service_enabled_guard_var
+    vars:
+        packagename: ufw
+        servicename: ufw
+        variable: var_network_filtering_service
+        value: ufw
+{{%- else %}}
 template:
     name: service_enabled
     vars:
         servicename: ufw
-
-platform: system_with_kernel and package[ufw]
+{{%- endif %}}