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

Merge fort-nix/nix-bitcoin#493: lndconnect-onion: Fix feature for custom operator names

Browse Source 
cbf327c808 lndconnect-onion: fix for custom operator names (Erik Arvstedt)

Pull request description:

ACKs for top commit:
  jonasnick:
    utACK cbf327c808

Tree-SHA512: 9088ecd2e73a8818f195a4acaa27c8a6fc6ca5b875881e65b3a715d2839c6261c58967acf1590429fa530477a6d2fcee2171347353c462d1bcfa62846a9182af
This commit is contained in:
Jonas Nick 2022-06-02 11:36:19 +00:00
commit 32d2ded412
No known key found for this signature in database
GPG Key ID: 4861DBF262123605
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/lndconnect-onion.nix
View File

@ -70,6 +70,8 @@ let
--adminmacaroonpath='${macaroonPath}' \ --adminmacaroonpath='${macaroonPath}' \
--configfile=/dev/null "$@" --configfile=/dev/null "$@"
''; '';
operatorName = config.nix-bitcoin.operator.name;
in { in {
inherit options; inherit options;
@ -108,12 +110,12 @@ in {
}; };
}; };
# This also allows nodeinfo to show the clightning-rest onion address # This also allows nodeinfo to show the clightning-rest onion address
nix-bitcoin.onionAddresses.access.operator = [ "clightning-rest" ]; nix-bitcoin.onionAddresses.access.${operatorName} = [ "clightning-rest" ];
environment.systemPackages = [( environment.systemPackages = [(
mkLndconnect { mkLndconnect {
name = "lndconnect-onion-clightning"; name = "lndconnect-onion-clightning";
onionService = "operator/clightning-rest"; onionService = "${operatorName}/clightning-rest";
port = clightning-rest.port; port = clightning-rest.port;
certPath = "${clightning-rest.dataDir}/certs/certificate.pem"; certPath = "${clightning-rest.dataDir}/certs/certificate.pem";
macaroonPath = "${clightning-rest.dataDir}/certs/access.macaroon"; macaroonPath = "${clightning-rest.dataDir}/certs/access.macaroon";