Merge #493: lndconnect-onion: Fix feature for custom operator names

cbf327c lndconnect-onion: fix for custom operator names (Erik Arvstedt)

Pull request description:

ACKs for top commit:
  jonasnick:
    utACK cbf327c

Tree-SHA512: 9088ecd2e73a8818f195a4acaa27c8a6fc6ca5b875881e65b3a715d2839c6261c58967acf1590429fa530477a6d2fcee2171347353c462d1bcfa62846a9182af

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";