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

joinmarket-ob-watcher: move resource files to extra dir

Browse Source 
Don't clutter joinmarket/bin with ob-watcher resource files.
This commit is contained in:
Erik Arvstedt 2021-08-12 15:29:19 +02:00
parent 32d0f08d77
commit d7f9e33e1c
No known key found for this signature in database
GPG Key ID: 33312B944DD97846
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/joinmarket-ob-watcher.nix
View File

@ -77,7 +77,7 @@ in {
StateDirectoryMode = "770"; StateDirectoryMode = "770";
WorkingDirectory = cfg.dataDir; # The service creates dir 'logs' in the working dir WorkingDirectory = cfg.dataDir; # The service creates dir 'logs' in the working dir
ExecStart = '' ExecStart = ''
${nbPkgs.joinmarket}/bin/ob-watcher --datadir=${cfg.dataDir} \ ${nbPkgs.joinmarket}/bin/jm-ob-watcher --datadir=${cfg.dataDir} \
--host=${cfg.address} --port=${toString cfg.port} --host=${cfg.address} --port=${toString cfg.port}
''; '';
SystemCallFilter = nbLib.defaultHardening.SystemCallFilter ++ [ "mbind" ] ; SystemCallFilter = nbLib.defaultHardening.SystemCallFilter ++ [ "mbind" ] ;

10
pkgs/joinmarket/default.nix
View File

@ -32,7 +32,6 @@ stdenv.mkDerivation {
} }
cp scripts/joinmarketd.py $out/bin/joinmarketd cp scripts/joinmarketd.py $out/bin/joinmarketd
cp scripts/obwatch/ob-watcher.py $out/bin/ob-watcher
cpBin add-utxo.py cpBin add-utxo.py
cpBin convert_old_wallet.py cpBin convert_old_wallet.py
cpBin receive-payjoin.py cpBin receive-payjoin.py
@ -46,8 +45,13 @@ stdenv.mkDerivation {
chmod +x -R $out/bin chmod +x -R $out/bin
patchShebangs $out/bin patchShebangs $out/bin
## ob-watcher
obw=$out/libexec/joinmarket-ob-watcher
install -D scripts/obwatch/ob-watcher.py $obw/ob-watcher
patchShebangs $obw/ob-watcher
ln -s $obw/ob-watcher $out/bin/jm-ob-watcher
# These files must be placed in the same dir as ob-watcher # These files must be placed in the same dir as ob-watcher
cp scripts/obwatch/{orderbook.html,sybil_attack_calculations.py} $out/bin/ cp -r scripts/obwatch/{orderbook.html,sybil_attack_calculations.py,vendor} $obw
cp -r scripts/obwatch/vendor $out/bin/vendor
''; '';
} }