summaryrefslogtreecommitdiffstats
path: root/nixos
diff options
context:
space:
mode:
Diffstat (limited to 'nixos')
-rw-r--r--nixos/doc/manual/from_md/release-notes/rl-2111.section.xml11
-rw-r--r--nixos/doc/manual/release-notes/rl-2111.section.md2
-rw-r--r--nixos/modules/services/backup/sanoid.nix9
-rw-r--r--nixos/modules/services/network-filesystems/ipfs.nix2
4 files changed, 21 insertions, 3 deletions
diff --git a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml
index 204bcd74dade..5554927b8b2a 100644
--- a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml
+++ b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml
@@ -1132,6 +1132,17 @@ Superuser created successfully.
rofi’s changelog</link>.
</para>
</listitem>
+ <listitem>
+ <para>
+ ipfs now defaults to not listening on you local network. This
+ setting was change as server providers won’t accept port
+ scanning on their private network. If you have several ipfs
+ instances running on a network you own, feel free to change
+ the setting <literal>ipfs.localDiscovery = true;</literal>.
+ localDiscovery enables different instances to discover each
+ other and share data.
+ </para>
+ </listitem>
</itemizedlist>
</section>
</section>
diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md
index 5618fe830e3c..00844d529b77 100644
--- a/nixos/doc/manual/release-notes/rl-2111.section.md
+++ b/nixos/doc/manual/release-notes/rl-2111.section.md
@@ -324,3 +324,5 @@ To be able to access the web UI this port needs to be opened in the firewall.
- GNOME desktop environment now enables `QGnomePlatform` as the Qt platform theme, which should avoid crashes when opening file chooser dialogs in Qt apps by using XDG desktop portal. Additionally, it will make the apps fit better visually.
- `rofi` has been updated from '1.6.1' to '1.7.0', one important thing is the removal of the old xresources based configuration setup. Read more [in rofi's changelog](https://github.com/davatorium/rofi/blob/cb12e6fc058f4a0f4f/Changelog#L1).
+
+- ipfs now defaults to not listening on you local network. This setting was change as server providers won't accept port scanning on their private network. If you have several ipfs instances running on a network you own, feel free to change the setting `ipfs.localDiscovery = true;`. localDiscovery enables different instances to discover each other and share data.
diff --git a/nixos/modules/services/backup/sanoid.nix b/nixos/modules/services/backup/sanoid.nix
index 41d0e2e1df68..e70063415ec0 100644
--- a/nixos/modules/services/backup/sanoid.nix
+++ b/nixos/modules/services/backup/sanoid.nix
@@ -57,8 +57,13 @@ let
useTemplate = use_template;
recursive = mkOption {
- description = "Whether to recursively snapshot dataset children.";
- type = types.bool;
+ description = ''
+ Whether to recursively snapshot dataset children.
+ You can also set this to <literal>"zfs"</literal> to handle datasets
+ recursively in an atomic way without the possibility to
+ override settings for child datasets.
+ '';
+ type = with types; oneOf [ bool (enum [ "zfs" ]) ];
default = false;
};
diff --git a/nixos/modules/services/network-filesystems/ipfs.nix b/nixos/modules/services/network-filesystems/ipfs.nix
index 57f5f6b006c8..cb6e8278b119 100644
--- a/nixos/modules/services/network-filesystems/ipfs.nix
+++ b/nixos/modules/services/network-filesystems/ipfs.nix
@@ -173,7 +173,7 @@ in
description = ''Whether to enable local discovery for the ipfs daemon.
This will allow ipfs to scan ports on your local network. Some hosting services will ban you if you do this.
'';
- default = true;
+ default = false;
};
serviceFdlimit = mkOption {