Sovran_Systems/Sovran_SystemsOS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Merge pull request #344 from naturallaw777/copilot/fix-wallet-connections-cert-path

Browse Source 
Complete Wallet Connections cert-path wiring for interactive `nwc-wallet`
This commit is contained in:
Sovran Systems
2026-07-27 09:34:03 -05:00
committed by GitHub
parent 69c236d9ca bfa4f2f9e4
commit 016ceaa3df
1 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/nwc-wallets.nix
+17 -7
View File
@@ -14,6 +14,19 @@ let
lndRpcAddress = lib.attrByPath [ "services" "lnd" "rpcAddress" ] "127.0.0.1" config; lndRpcAddress = lib.attrByPath [ "services" "lnd" "rpcAddress" ] "127.0.0.1" config;
lndRpcPort = toString (lib.attrByPath [ "services" "lnd" "rpcPort" ] 10009 config); lndRpcPort = toString (lib.attrByPath [ "services" "lnd" "rpcPort" ] 10009 config);
lndCertPath = config.services.lnd.certPath; lndCertPath = config.services.lnd.certPath;
pythonManagerEnvironment = {
NWC_ALBY_HUB_API_BASE = albyHubApiBase;
NWC_LND_ADDRESS = "${lndRpcAddress}:${lndRpcPort}";
NWC_LND_CERT_FILE = lndCertPath;
NWC_LND_MACAROON_FILE = "/run/lnd/albyhub.macaroon";
};
wrappedNwcWallet = lib.hiPrio (pkgs.writeShellScriptBin "nwc-wallet" ''
export NWC_ALBY_HUB_API_BASE='${pythonManagerEnvironment.NWC_ALBY_HUB_API_BASE}'
export NWC_LND_ADDRESS='${pythonManagerEnvironment.NWC_LND_ADDRESS}'
export NWC_LND_CERT_FILE='${pythonManagerEnvironment.NWC_LND_CERT_FILE}'
export NWC_LND_MACAROON_FILE='${pythonManagerEnvironment.NWC_LND_MACAROON_FILE}'
exec ${config.services.sovranHub.webPackage}/bin/nwc-wallet "$@"
'');
albyhubWrapper = pkgs.writeShellScript "albyhub-wrapper" '' albyhubWrapper = pkgs.writeShellScript "albyhub-wrapper" ''
set -euo pipefail set -euo pipefail
@@ -125,7 +138,7 @@ lib.mkIf config.sovran_systemsOS.features."nwc-wallets" {
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
after = [ "albyhub.service" "sovran-hub-web.service" ]; after = [ "albyhub.service" "sovran-hub-web.service" ];
wants = [ "albyhub.service" ]; wants = [ "albyhub.service" ];
environment.NWC_ALBY_HUB_API_BASE = albyHubApiBase; environment = pythonManagerEnvironment;
serviceConfig = { serviceConfig = {
Type = "simple"; Type = "simple";
@@ -146,12 +159,9 @@ lib.mkIf config.sovran_systemsOS.features."nwc-wallets" {
}; };
}; };
systemd.services.sovran-hub-web.environment = { systemd.services.nwc-lnurl.environment.NWC_ALBY_HUB_API_BASE = albyHubApiBase;
NWC_ALBY_HUB_API_BASE = albyHubApiBase; systemd.services.sovran-hub-web.environment = pythonManagerEnvironment;
NWC_LND_ADDRESS = "${lndRpcAddress}:${lndRpcPort}"; environment.systemPackages = lib.mkBefore [ wrappedNwcWallet ];
NWC_LND_CERT_FILE = lndCertPath;
NWC_LND_MACAROON_FILE = "/run/lnd/albyhub.macaroon";
};
sovran_systemsOS.domainRequirements = [ sovran_systemsOS.domainRequirements = [
{ {