aiolabs/nix-bitcoin
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

joinmarket: share IRC server definitions between jm and ob-watcher

Browse source 
Also add server name comments.
This commit is contained in:
Erik Arvstedt 2021-10-13 14:44:36 +02:00
parent 59fc003ebd
commit ced1637d07
No known key found for this signature in database
GPG key ID: 33312B944DD97846
2 changed files with 26 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

23
modules/joinmarket-ob-watcher.nix
View file

@ -41,14 +41,7 @@ let
nbPkgs = config.nix-bitcoin.pkgs;
secretsDir = config.nix-bitcoin.secretsDir;
inherit (config.services) bitcoind;
torAddress = config.services.tor.client.socksListenAddress;
socks5Settings = with config.services.tor.client.socksListenAddress; ''
socks5 = true
socks5_host = ${addr}
socks5_port = ${toString port}
'';
inherit (config.services) bitcoind joinmarket;
configFile = builtins.toFile "config" ''
[BLOCKCHAIN]
@ -58,19 +51,7 @@ let
rpc_port = ${toString bitcoind.rpc.port}
rpc_user = ${bitcoind.rpc.users.joinmarket-ob-watcher.name}
[MESSAGING:server1]
host = darkirc6tqgpnwd3blln3yfv5ckl47eg7llfxkmtovrv7c7iwohhb6ad.onion
channel = joinmarket-pit
port = 6697
usessl = true
${socks5Settings}
[MESSAGING:server2]
host = ncwkrwxpq2ikcngxq3dy2xctuheniggtqeibvgofixpzvrwpa77tozqd.onion
channel = joinmarket-pit
port = 6667
usessl = false
${socks5Settings}
${joinmarket.ircServers}
'';
in {
inherit options;