cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

networking/nftables: make ruleset+rulesetFile non-exclusive

Browse source
This commit is contained in:
Maciej Krüger 2023-03-27 20:10:18 +02:00
parent a1dd69d761
commit 6658b3fcf1
No known key found for this signature in database
GPG key ID: 0D948CE19CF49C5F
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
nixos/modules/services/networking/nftables.nix
View file

@ -273,9 +273,10 @@ in
${table.content} ${table.content}
} }
'') enabledTables)} '') enabledTables)}
${if cfg.rulesetFile != null then '' ${cfg.ruleset}
${lib.optionalString (cfg.rulesetFile != null) ''
include "${cfg.rulesetFile}" include "${cfg.rulesetFile}"
'' else cfg.ruleset} ''}
''; '';
checkPhase = lib.optionalString cfg.checkRuleset '' checkPhase = lib.optionalString cfg.checkRuleset ''
cp $out ruleset.conf cp $out ruleset.conf