networking/nftables: make ruleset+rulesetFile non-exclusive

2023-03-27 20:10:18 +02:00 · 2023-03-27 20:10:18 +02:00 · 6658b3fcf1
commit 6658b3fcf1
parent a1dd69d761
1 changed files with 3 additions and 2 deletions
--- a/nixos/modules/services/networking/nftables.nix
+++ b/nixos/modules/services/networking/nftables.nix
@ -273,9 +273,10 @@ in
                ${table.content}
              }
            '') enabledTables)}
-            ${if cfg.rulesetFile != null then ''
+            ${cfg.ruleset}
+            ${lib.optionalString (cfg.rulesetFile != null) ''
              include "${cfg.rulesetFile}"
-            '' else cfg.ruleset}
+            ''}
          '';
          checkPhase = lib.optionalString cfg.checkRuleset ''
            cp $out ruleset.conf