Unverified Commit 6658b3fc authored by Maciej Krüger's avatar Maciej Krüger
Browse files

networking/nftables: make ruleset+rulesetFile non-exclusive

parent a1dd69d7

nixos/modules/services/networking/nftables.nix

+3 −2
Original line number Diff line number Diff line
@@ -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