From 159f551b93812fb8e645cb0d34dc37f4155ee183 Mon Sep 17 00:00:00 2001 From: nixbitcoin Date: Sun, 19 Apr 2020 14:44:03 +0200 Subject: [PATCH] Remove bitcoin, clightning, electrs, liquid user home directory --- modules/bitcoind.nix | 1 - modules/clightning.nix | 2 +- modules/electrs.nix | 1 - modules/liquid.nix | 1 - modules/lnd.nix | 2 +- 5 files changed, 2 insertions(+), 5 deletions(-) diff --git a/modules/bitcoind.nix b/modules/bitcoind.nix index 4dcd020..a082a5c 100644 --- a/modules/bitcoind.nix +++ b/modules/bitcoind.nix @@ -330,7 +330,6 @@ in { users.users.${cfg.user} = { group = cfg.group; description = "Bitcoin daemon user"; - home = cfg.dataDir; }; users.groups.${cfg.group} = {}; users.groups.bitcoinrpc = {}; diff --git a/modules/clightning.nix b/modules/clightning.nix index 607f9e7..11f1a92 100644 --- a/modules/clightning.nix +++ b/modules/clightning.nix @@ -8,6 +8,7 @@ let configFile = pkgs.writeText "config" '' autolisten=${if cfg.autolisten then "true" else "false"} network=bitcoin + bitcoin-datadir=${config.services.bitcoind.dataDir} ${optionalString (cfg.proxy != null) "proxy=${cfg.proxy}"} always-use-proxy=${if cfg.always-use-proxy then "true" else "false"} ${optionalString (cfg.bind-addr != null) "bind-addr=${cfg.bind-addr}"} @@ -76,7 +77,6 @@ in { description = "clightning User"; group = "clightning"; extraGroups = [ "bitcoinrpc" ]; - home = cfg.dataDir; }; users.groups.clightning = {}; diff --git a/modules/electrs.nix b/modules/electrs.nix index a7f0ee3..c6e9dae 100644 --- a/modules/electrs.nix +++ b/modules/electrs.nix @@ -107,7 +107,6 @@ in { description = "electrs User"; group = cfg.group; extraGroups = [ "bitcoinrpc" "bitcoin"]; - home = cfg.dataDir; }; users.groups.${cfg.group} = {}; } diff --git a/modules/liquid.nix b/modules/liquid.nix index 5716230..2bb604e 100644 --- a/modules/liquid.nix +++ b/modules/liquid.nix @@ -235,7 +235,6 @@ in { users.users.${cfg.user} = { group = cfg.group; description = "Liquid sidechain user"; - home = cfg.dataDir; }; users.groups.${cfg.group} = {}; nix-bitcoin.secrets.liquid-rpcpassword.user = "liquid"; diff --git a/modules/lnd.nix b/modules/lnd.nix index 878a4ec..bbfb614 100644 --- a/modules/lnd.nix +++ b/modules/lnd.nix @@ -156,7 +156,7 @@ in { description = "LND User"; group = "lnd"; extraGroups = [ "bitcoinrpc" ]; - home = cfg.dataDir; + home = cfg.dataDir; # lnd creates .lnd dir in HOME }; users.groups.lnd = {}; nix-bitcoin.secrets = {