about summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorMaciej Krüger <mkg20001@gmail.com>2022-12-26 01:25:09 +0100
committerMaciej Krüger <mkg20001@gmail.com>2023-08-28 00:40:18 +0200
commitd5a08266866f91efd7d27ccde9f89469b09047a2 (patch)
tree22158f1e2a4bd88994edcdc807cf88e96bb8df01 /nixos
parentdc3f8728b949550d10ffe6a165cd2a1d5b9f7a97 (diff)
downloadnixlib-d5a08266866f91efd7d27ccde9f89469b09047a2.tar
nixlib-d5a08266866f91efd7d27ccde9f89469b09047a2.tar.gz
nixlib-d5a08266866f91efd7d27ccde9f89469b09047a2.tar.bz2
nixlib-d5a08266866f91efd7d27ccde9f89469b09047a2.tar.lz
nixlib-d5a08266866f91efd7d27ccde9f89469b09047a2.tar.xz
nixlib-d5a08266866f91efd7d27ccde9f89469b09047a2.tar.zst
nixlib-d5a08266866f91efd7d27ccde9f89469b09047a2.zip
networking/nftables: remove no longer relevant conflict warnings
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/services/networking/nftables.nix2
1 files changed, 0 insertions, 2 deletions
diff --git a/nixos/modules/services/networking/nftables.nix b/nixos/modules/services/networking/nftables.nix
index 810dc22a20a8..a96528f2d184 100644
--- a/nixos/modules/services/networking/nftables.nix
+++ b/nixos/modules/services/networking/nftables.nix
@@ -134,7 +134,6 @@ in
         lib.mdDoc ''
           The ruleset to be used with nftables.  Should be in a format that
           can be loaded using "/bin/nft -f".  The ruleset is updated atomically.
-          This option conflicts with rulesetFile.
         '';
     };
     networking.nftables.rulesetFile = mkOption {
@@ -144,7 +143,6 @@ in
         lib.mdDoc ''
           The ruleset file to be used with nftables.  Should be in a format that
           can be loaded using "nft -f".  The ruleset is updated atomically.
-          This option conflicts with ruleset and nftables based firewall.
         '';
     };
     networking.nftables.tables = mkOption {