From cbf327c808346b465baefc54eb0b41629756c2a8 Mon Sep 17 00:00:00 2001
From: Erik Arvstedt <erik.arvstedt@gmail.com>
Date: Thu, 2 Jun 2022 12:34:45 +0200
Subject: [PATCH] lndconnect-onion: fix for custom operator names

---
 modules/lndconnect-onion.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/modules/lndconnect-onion.nix b/modules/lndconnect-onion.nix
index 740d4b2..5377313 100644
--- a/modules/lndconnect-onion.nix
+++ b/modules/lndconnect-onion.nix
@@ -70,6 +70,8 @@ let
      --adminmacaroonpath='${macaroonPath}' \
      --configfile=/dev/null "$@"
   '';
+
+  operatorName = config.nix-bitcoin.operator.name;
 in {
   inherit options;
 
@@ -108,12 +110,12 @@ in {
         };
       };
       # 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 = [(
         mkLndconnect {
           name = "lndconnect-onion-clightning";
-          onionService = "operator/clightning-rest";
+          onionService = "${operatorName}/clightning-rest";
           port = clightning-rest.port;
           certPath = "${clightning-rest.dataDir}/certs/certificate.pem";
           macaroonPath = "${clightning-rest.dataDir}/certs/access.macaroon";