diff options
| author | Parnell Springmeyer <parnell@digitalmentat.com> | 2017-01-26 02:00:04 -0800 |
|---|---|---|
| committer | Parnell Springmeyer <parnell@digitalmentat.com> | 2017-01-26 02:00:04 -0800 |
| commit | a26a796d5c7fa305e007c2b5229e0521c8b3fb0f (patch) | |
| tree | 6c35defae305b0da581f757b72b461a8f6052620 /nixos/release.nix | |
| parent | ad8fde5e5d9bc25a54ac238f485e28b37d6d185a (diff) | |
| parent | 142696de884213e01cc518af813a20d2e2ece3cc (diff) | |
| download | nixlib-a26a796d5c7fa305e007c2b5229e0521c8b3fb0f.tar nixlib-a26a796d5c7fa305e007c2b5229e0521c8b3fb0f.tar.gz nixlib-a26a796d5c7fa305e007c2b5229e0521c8b3fb0f.tar.bz2 nixlib-a26a796d5c7fa305e007c2b5229e0521c8b3fb0f.tar.lz nixlib-a26a796d5c7fa305e007c2b5229e0521c8b3fb0f.tar.xz nixlib-a26a796d5c7fa305e007c2b5229e0521c8b3fb0f.tar.zst nixlib-a26a796d5c7fa305e007c2b5229e0521c8b3fb0f.zip | |
Merging against master - updating smokingpig, rebase was going to be messy
Diffstat (limited to 'nixos/release.nix')
| -rw-r--r-- | nixos/release.nix | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/nixos/release.nix b/nixos/release.nix index dfa9b67654fb..2d78a4db9736 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -273,6 +273,7 @@ in rec { tests.mysql = callTest tests/mysql.nix {}; tests.mysqlReplication = callTest tests/mysql-replication.nix {}; tests.nat.firewall = callTest tests/nat.nix { withFirewall = true; }; + tests.nat.firewall-conntrack = callTest tests/nat.nix { withFirewall = true; withConntrackHelpers = true; }; tests.nat.standalone = callTest tests/nat.nix { withFirewall = false; }; tests.networking.networkd = callSubTests tests/networking.nix { networkd = true; }; tests.networking.scripted = callSubTests tests/networking.nix { networkd = false; }; |