summary refs log tree commit diff
path: root/nixos/doc
diff options
context:
space:
mode:
authorJörg Thalheim <Mic92@users.noreply.github.com>2018-11-23 11:42:16 +0000
committerGitHub <noreply@github.com>2018-11-23 11:42:16 +0000
commitd3aeed389c3558fcbd54966991de795f37d338cb (patch)
tree6922074a63f16d35e04721c732aeca343515a4bf /nixos/doc
parent7acd4eb51b99caa287b69fcf0fc687066cbb9880 (diff)
parent308ab4ea25f7d6368ba5b7713fa4ef82cdf8e95e (diff)
downloadnixpkgs-d3aeed389c3558fcbd54966991de795f37d338cb.tar
nixpkgs-d3aeed389c3558fcbd54966991de795f37d338cb.tar.gz
nixpkgs-d3aeed389c3558fcbd54966991de795f37d338cb.tar.bz2
nixpkgs-d3aeed389c3558fcbd54966991de795f37d338cb.tar.lz
nixpkgs-d3aeed389c3558fcbd54966991de795f37d338cb.tar.xz
nixpkgs-d3aeed389c3558fcbd54966991de795f37d338cb.tar.zst
nixpkgs-d3aeed389c3558fcbd54966991de795f37d338cb.zip
Merge pull request #50641 from blaxill/firewallMerge
nixos/firewall: Always use global firewall.allowed rules
Diffstat (limited to 'nixos/doc')
-rw-r--r--nixos/doc/manual/release-notes/rl-1903.xml11
1 files changed, 11 insertions, 0 deletions
diff --git a/nixos/doc/manual/release-notes/rl-1903.xml b/nixos/doc/manual/release-notes/rl-1903.xml
index ceb26ba5aff..49f475913d8 100644
--- a/nixos/doc/manual/release-notes/rl-1903.xml
+++ b/nixos/doc/manual/release-notes/rl-1903.xml
@@ -222,6 +222,17 @@
      reset to the default value (<literal>false</literal>).
     </para>
    </listitem>
+   <listitem>
+    <para>
+     Network interface indiscriminate NixOS firewall options
+     (<literal>networking.firewall.allow*</literal>) are now preserved when also
+     setting interface specific rules such as <literal>networking.firewall.interfaces.en0.allow*</literal>.
+     These rules continue to use the pseudo device "default"
+     (<literal>networking.firewall.interfaces.default.*</literal>), and assigning
+     to this pseudo device will override the (<literal>networking.firewall.allow*</literal>)
+     options.
+    </para>
+   </listitem>
   </itemizedlist>
  </section>