Invert the logic for variable dependency for service disabled rules

ComplianceAsCode · May 21, 2024 · 87ba124 · 87ba124
1 parent ca9fefa
commit 87ba124
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 6 deletions.
diff --git a/...stem/network/network-firewalld/firewalld_deactivation/service_firewalld_disabled/rule.yml b/...stem/network/network-firewalld/firewalld_deactivation/service_firewalld_disabled/rule.yml
@@ -45,8 +45,7 @@ template:
         packagename: firewalld
         servicename: firewalld
         variable: var_network_filtering_service
-        value: nftables|iptables
-        operation: pattern match
+        value: firewalld
 {{%- else %}}
 template:
     name: service_disabled

diff --git a/...de/system/network/network-iptables/iptables_activation/service_ip6tables_enabled/rule.yml b/...de/system/network/network-iptables/iptables_activation/service_ip6tables_enabled/rule.yml
@@ -34,8 +34,18 @@ ocil: |-
     <br /><br />
     {{{ ocil_service_enabled(service="ip6tables") }}}
 
+{{%- if product in [ "sle12", "sle15" ] %}}
+template:
+    name: service_enabled_guard_var
+    vars:
+        packagename: iptables
+        servicename: iptables
+        variable: var_network_filtering_service
+        value: iptables
+{{%- else %}}
 template:
     name: service_enabled
     vars:
         servicename: ip6tables
         packagename: iptables-ipv6
+{{%- endif %}}
diff --git a/...ide/system/network/network-iptables/iptables_activation/service_iptables_enabled/rule.yml b/...ide/system/network/network-iptables/iptables_activation/service_iptables_enabled/rule.yml
@@ -39,8 +39,8 @@ ocil: |-
 template:
     name: service_enabled_guard_var
     vars:
-        packagename: iptables
-        servicename: iptables
+        packagename: ip6tables
+        servicename: iptables-ipv6
         variable: var_network_filtering_service
         value: iptables
 {{%- else %}}

diff --git a/linux_os/guide/system/network/network-nftables/service_nftables_disabled/rule.yml b/linux_os/guide/system/network/network-nftables/service_nftables_disabled/rule.yml
@@ -43,8 +43,7 @@ template:
         packagename: nftables
         servicename: nftables
         variable: var_network_filtering_service
-        value: firewalld|iptables
-        operation: pattern match
+        value: nftables
 {{%- else %}}
 template:
     name: service_disabled