greg/nix-bitcoin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

netns: use map instead of concatMap

Browse Source
This commit is contained in:
Erik Arvstedt 2020-08-21 22:35:56 +02:00
parent b7fc819be5
commit a3ae8668e6
No known key found for this signature in database
GPG Key ID: 33312B944DD97846
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/netns-isolation.nix
View File

@ -210,9 +210,7 @@ in {
]; ];
rpcallowip = [ rpcallowip = [
"127.0.0.1" "127.0.0.1"
] ++ lib.lists.concatMap (n: [ ] ++ map (n: "${netns.${n}.address}") netns.bitcoind.availableNetns;
"${netns.${n}.address}"
]) netns.bitcoind.availableNetns;
cli = pkgs.writeScriptBin "bitcoin-cli" '' cli = pkgs.writeScriptBin "bitcoin-cli" ''
netns-exec nb-bitcoind ${config.services.bitcoind.package}/bin/bitcoin-cli -datadir='${config.services.bitcoind.dataDir}' "$@" netns-exec nb-bitcoind ${config.services.bitcoind.package}/bin/bitcoin-cli -datadir='${config.services.bitcoind.dataDir}' "$@"
''; '';
@ -253,9 +251,7 @@ in {
]; ];
rpcallowip = [ rpcallowip = [
"127.0.0.1" "127.0.0.1"
] ++ lib.lists.concatMap (n: [ ] ++ map (n: "${netns.${n}.address}") netns.liquidd.availableNetns;
"${netns.${n}.address}"
]) netns.liquidd.availableNetns;
mainchainrpchost = netns.bitcoind.address; mainchainrpchost = netns.bitcoind.address;
cli = pkgs.writeScriptBin "elements-cli" '' cli = pkgs.writeScriptBin "elements-cli" ''
netns-exec nb-liquidd ${pkgs.nix-bitcoin.elementsd}/bin/elements-cli -datadir='${config.services.liquidd.dataDir}' "$@" netns-exec nb-liquidd ${pkgs.nix-bitcoin.elementsd}/bin/elements-cli -datadir='${config.services.liquidd.dataDir}' "$@"