Merge pull request #1769 from jrha/cleanup-shorewall

ncm-shorewall: Fix wrapping and indentation in pan
quattor · Dec 4, 2024 · 145f2b1 · 145f2b1
2 parents 31e9306 + 06913a3
commit 145f2b1
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/ncm-shorewall/src/main/pan/components/shorewall/schema.pan b/ncm-shorewall/src/main/pan/components/shorewall/schema.pan
@@ -161,8 +161,9 @@ type component_shorewall_rules = {
     "loglevel" ? string
 };
 
-type component_shorewall_shorewall_blacklist = string with
-    match(SELF, '^(ALL|NEW|ESTABLISHED|RELATED|INVALID|UNTRACKED)$');
+type component_shorewall_shorewall_blacklist = string with match(SELF,
+    '^(ALL|NEW|ESTABLISHED|RELATED|INVALID|UNTRACKED)$'
+);
 
 @{shorewall.conf options. only configured options are written to the configfile}
 type component_shorewall_shorewall = {
@@ -296,8 +297,10 @@ type component_shorewall = {
     @{tcpri configuration}
     "tcpri" ? component_shorewall_tcpri[]
     @{masq configuration}
-    "masq" ? component_shorewall_masq[] with {deprecated(0,
-        'deprecated in favor of shorewall-snat which was introduced in Shorewall 5.0.14'); true; }
+    "masq" ? component_shorewall_masq[] with {
+        deprecated(0, 'deprecated in favor of shorewall-snat which was introduced in Shorewall 5.0.14');
+        true;
+    }
     @{snat configuration}
     "snat" ? component_shorewall_snat[]
     @{providers configuration}