ruleset: reorder declarations & output tweaks
authorJo-Philipp Wich <jo@mein.io>
Tue, 14 Jun 2022 14:23:50 +0000 (16:23 +0200)
committerJo-Philipp Wich <jo@mein.io>
Tue, 14 Jun 2022 14:27:26 +0000 (16:27 +0200)
commit11410b80eb9c442c4850cfc3034267f3f72a196c
treec1448baec03e4a8dbe6910a97e6a947aacc25210
parente1cb763b65262eef5958d19fe922380aa1e96570
ruleset: reorder declarations & output tweaks

 - Omit "Set definitions" header if no sets are declared
 - Always emit ${zone}_devices and ${zone}_subnets defines, even if empty
 - Move CT helper definitions to the top
 - Move ${zone}_helper chain definitions after ${zone}_forward chain defs
 - Consistently use two line spacing for output sections

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
21 files changed:
root/usr/share/firewall4/templates/ruleset.uc
tests/01_configuration/01_ruleset
tests/01_configuration/02_rule_order
tests/02_zones/01_policies
tests/02_zones/02_masq
tests/02_zones/03_masq_src_dest_restrictions
tests/02_zones/04_wildcard_devices
tests/02_zones/05_subnet_mask_matches
tests/02_zones/06_family_selections
tests/02_zones/07_helpers
tests/03_rules/01_direction
tests/03_rules/02_enabled
tests/03_rules/03_constraints
tests/03_rules/04_icmp
tests/03_rules/05_mangle
tests/03_rules/06_subnet_mask_matches
tests/03_rules/07_redirect
tests/03_rules/08_family_inheritance
tests/03_rules/09_time
tests/03_rules/10_notrack
tests/04_forwardings/01_family_selections