Sovran Tailorandnaturallaw777
31cd5f96f2
- lndconnect.nix: rewrite to lnd-only (320 lines removed) - remove services.clightning.plugins.clnrest.lnconnect and services.clightning-rest.lndconnect (Sovran only uses services.lnd.lndconnect for Zeus) Fixes: 'services.clightning.plugins.clnrest.address does not exist' on f13ff45 and 'attribute enable missing' at lndconnect.nix:216 - btcpayserver.nix: remove liquidd (lbtc) dead branch - Sovran uses lbtc=false * remove inherit (config.services) bitcoind liquidd -> just bitcoind * lbtc chains/rpc handling is dead code, keep guards but no need for liquidd service - mempool.nix: remove fulcrum branch - Sovran uses electrs only - rtl.nix: remove lightning-loop block and clightning service block (lnd only) - Delete modules/bitcoin/stubs.nix entirely - no dead service references left * liquidd, fulcrum, lightning-loop, joinmarket now not referenced at all * clightning already handled via guards, not stubs - Result: modules/bitcoin/ is now 100% tailored to Sovran (bitcoind+knots, lnd, electrs, rtl, btcpayserver, mempool) No more stubs whack-a-mole on any nixos-unstable
64 lines
2.1 KiB
Nix
64 lines
2.1 KiB
Nix
{ config, lib, pkgs, ... }:
|
|
|
|
with lib;
|
|
let
|
|
cfg = config.services.lnd;
|
|
operatorName = config.nix-bitcoin.operator.name;
|
|
nbLib = config.nix-bitcoin.lib;
|
|
|
|
mkLndconnect = { name, isClightning ? false, enableOnion, onionService, port, certPath, authSecretPath }:
|
|
let
|
|
lnd = config.services.lnd;
|
|
getOnionAddress = "cat ${config.nix-bitcoin.secretsDir}/onion-address-${onionService} 2>/dev/null || echo ${onionService}.onion";
|
|
in pkgs.writeScriptBin name ''
|
|
#!${pkgs.bash}/bin/bash
|
|
set -e
|
|
certPath="${certPath}"
|
|
authSecretPath="${authSecretPath}"
|
|
if [ "${toString enableOnion}" = "1" ]; then
|
|
host=$(cat /var/lib/tor/onion/${onionService}/hostname 2>/dev/null || echo "${onionService}.onion")
|
|
port="${toString port}"
|
|
else
|
|
host="${nbLib.address lnd.restAddress}"
|
|
port="${toString lnd.restPort}"
|
|
fi
|
|
# lndconnect is provided by pkgs.lndconnect
|
|
${getExe pkgs.lndconnect} --host="$host" --port="$port" --cert="$certPath" --macaroon="$authSecretPath" "$@"
|
|
'';
|
|
in {
|
|
options.services.lnd.lndconnect = {
|
|
enable = mkOption {
|
|
type = types.bool;
|
|
default = false;
|
|
description = "Enable lndconnect for LND";
|
|
};
|
|
onion = mkOption {
|
|
type = types.bool;
|
|
default = false;
|
|
description = "Expose lndconnect via Tor onion service";
|
|
};
|
|
};
|
|
|
|
config = mkIf cfg.enable (mkMerge [
|
|
(mkIf cfg.lndconnect.enable {
|
|
environment.systemPackages = [
|
|
(mkLndconnect {
|
|
name = "lndconnect";
|
|
enableOnion = cfg.lndconnect.onion;
|
|
onionService = "${operatorName}/lnd";
|
|
port = cfg.restPort;
|
|
certPath = cfg.certPath;
|
|
authSecretPath = "${cfg.networkDir}/admin.macaroon";
|
|
})
|
|
];
|
|
})
|
|
(mkIf (cfg.lndconnect.enable && cfg.lndconnect.onion) {
|
|
services.tor.relay.onionServices.lnd = nbLib.mkOnionService {
|
|
map = [{ port = cfg.restPort; target = { addr = nbLib.address cfg.restAddress; port = cfg.restPort; }; }];
|
|
version = 3;
|
|
};
|
|
nix-bitcoin.onionAddresses.access.${operatorName} = [ "lnd" ];
|
|
})
|
|
]);
|
|
}
|