about summary refs log tree commit diff
path: root/nixos/modules/services/network-filesystems
diff options
context:
space:
mode:
authorCorbin <cds@corbinsimpson.com>2019-02-19 09:55:23 -0800
committerCorbin <cds@corbinsimpson.com>2019-02-19 10:02:37 -0800
commitfa6ad02951a47bc4f34b4559f33dfff15a71ca40 (patch)
tree6631bc0a9f33bd3a44860347b41d10f0142d802a /nixos/modules/services/network-filesystems
parent3e3e3918f228a3a30cd216ba0572b18c12bca401 (diff)
downloadnixlib-fa6ad02951a47bc4f34b4559f33dfff15a71ca40.tar
nixlib-fa6ad02951a47bc4f34b4559f33dfff15a71ca40.tar.gz
nixlib-fa6ad02951a47bc4f34b4559f33dfff15a71ca40.tar.bz2
nixlib-fa6ad02951a47bc4f34b4559f33dfff15a71ca40.tar.lz
nixlib-fa6ad02951a47bc4f34b4559f33dfff15a71ca40.tar.xz
nixlib-fa6ad02951a47bc4f34b4559f33dfff15a71ca40.tar.zst
nixlib-fa6ad02951a47bc4f34b4559f33dfff15a71ca40.zip
services.tahoe: Use `networking.hostName`.
Previously we used nothing, leading to #25273.

Big thanks to @t184256 for developing and testing this fix.

Fixes #25273.
Diffstat (limited to 'nixos/modules/services/network-filesystems')
-rw-r--r--nixos/modules/services/network-filesystems/tahoe.nix5
1 files changed, 4 insertions, 1 deletions
diff --git a/nixos/modules/services/network-filesystems/tahoe.nix b/nixos/modules/services/network-filesystems/tahoe.nix
index 534862a3c9e4..e7b048a6741c 100644
--- a/nixos/modules/services/network-filesystems/tahoe.nix
+++ b/nixos/modules/services/network-filesystems/tahoe.nix
@@ -243,7 +243,10 @@ in
             preStart = ''
               if [ ! -d ${lib.escapeShellArg nodedir} ]; then
                 mkdir -p /var/db/tahoe-lafs
-                tahoe create-introducer ${lib.escapeShellArg nodedir}
+                # See https://github.com/NixOS/nixpkgs/issues/25273
+                tahoe create-introducer \
+                  --hostname="${config.networking.hostName}" \
+                  ${lib.escapeShellArg nodedir}
               fi
 
               # Tahoe has created a predefined tahoe.cfg which we must now