nixos/firewall: merge global and interface specific rules #50625
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Hmm, I think there is something wrong with this currently, investigating… |
blaxill
force-pushed
the
firewallMerge
branch
3 times, most recently
from
0494e1f
to
c6a36ef
Compare
GrahamcOfBorg
added
8.has: clean-up
10.rebuild-linux: 0
and removed
10.rebuild-linux: 1-10
labels
Add the firewall.allowed* rules to the "default" interface (applied to all interfaces), instead of using them as a default value for the firewall.interface.* attr
blaxill
force-pushed
the
firewallMerge
branch
from
c6a36ef
to
80e0573
Compare
|
Closing this temporarily while I fix it |
infinisil
reviewed
Nov 18, 2018
| default = { | ||
| default = mapAttrs (name: value: cfg."${name}") commonOptions; | ||
| }; | ||
| default = { }; | ||
| type = with types; attrsOf (submodule [ { options = commonOptions; } ]); |
There was a problem hiding this comment.
You have to set the defaults from within the module, like this:
submodule {
options = commonOptions;
config = mapAttrs (name: value: mkOptionDefault cfg.${name}) commonOptions;
}
9 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Merge global and interface specific firewall.allowed* rules, instead of
silently dropping global rules when both types are set.
Motivation for this change
Currently global
networking.firewall.allowed*are dropped for interfaces when they have interface specific rules. Although this was documented, the more intuitive option would be to merge the rules.#47580
Things done
Tested using sandboxing (nix.useSandbox on NixOS, or option
sandboxinnix.confon non-NixOS)Built on platform(s)
Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
Ran
nix-build firewall.nix, I'm not sure if it finished cleanly, it ends with:nix-shell -p nox --run "nox-review wip"./result/bin/)nix path-info -Sbefore and after)