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

Merge branch 'nixbitcoin-liquid-tor'

Browse Source
This commit is contained in:
Jonas Nick 2019-03-18 15:21:01 +00:00
commit 022ba88450
No known key found for this signature in database
GPG Key ID: 4861DBF262123605
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
modules/nix-bitcoin.nix
View File

@ -151,7 +151,16 @@ in {
mainchainrpcuser=${config.services.bitcoind.rpcuser} mainchainrpcuser=${config.services.bitcoind.rpcuser}
mainchainrpcport=8332 mainchainrpcport=8332
"; ";
services.liquidd.listen = true;
services.liquidd.proxy = config.services.tor.client.socksListenAddress;
services.liquidd.port = 7042;
services.tor.hiddenServices.liquidd = {
map = [{
port = config.services.liquidd.port; toPort = config.services.liquidd.port;
}];
version = 3;
};
services.lightning-charge.enable = cfg.modules == "all"; services.lightning-charge.enable = cfg.modules == "all";
services.nanopos.enable = cfg.modules == "all"; services.nanopos.enable = cfg.modules == "all";
services.nix-bitcoin-webindex.enable = cfg.modules == "all"; services.nix-bitcoin-webindex.enable = cfg.modules == "all";

6
pkgs/nodeinfo.sh
View File

@ -17,6 +17,12 @@ if [ -e "$NGINX_ONION_FILE" ]; then
echo NGINX_ONION="$NGINX_ONION" echo NGINX_ONION="$NGINX_ONION"
fi fi
LIQUIDD_ONION_FILE=/var/lib/tor/onion/liquidd/hostname
if [ -e "$LIQUIDD_ONION_FILE" ]; then
LIQUIDD_ONION="$(cat $LIQUIDD_ONION_FILE)"
echo LIQUIDD_ONION="$LIQUIDD_ONION"
fi
SPARKWALLET_ONION_FILE=/var/lib/tor/onion/spark-wallet/hostname SPARKWALLET_ONION_FILE=/var/lib/tor/onion/spark-wallet/hostname
if [ -e "$SPARKWALLET_ONION_FILE" ]; then if [ -e "$SPARKWALLET_ONION_FILE" ]; then
SPARKWALLET_ONION="$(cat $SPARKWALLET_ONION_FILE)" SPARKWALLET_ONION="$(cat $SPARKWALLET_ONION_FILE)"