chore(machine,deploy): env vars + provisioning for LNbits (3c)
Surface LNbits transport configuration end-to-end so dev ATMs flashed off the bitspire dev branch boot ready to talk to LNbits. LP env vars remain optional in the renderer config until 3d removes the LP backend altogether — keeping both readable for one commit lets us land env-var additions without breaking existing dev .envs. - apps/machine/.env.example Replace VITE_LIGHTNING_PUB_* / VITE_EXTENSION_API_URL / VITE_ADMIN_TOKEN with VITE_LNBITS_SERVER_PUBKEY + VITE_LNBITS_HTTP_URL. Update generate-keypair guidance and drop the Lamassu-branded header. - apps/machine/electron/main.ts, preload.ts, src/types/electron.d.ts get-config IPC now exposes lnbitsServerPubkey + lnbitsHttpUrl. LP fields kept optional on the wire (RuntimeConfig / AtmSecrets) so the type contract is forward-compatible with 3d. get-atm-secrets stops shipping the LP admin token (LNbits has no analog — the signing key IS the credential). - apps/machine/src/services/lightning.ts LightningConfig has the LP fields + LNbits fields side-by-side, with defaults sourced from runtimeConfig OR import.meta.env. Renderer code is unchanged. - deploy/nixos/provision-atm.sh Rewritten to push LNbits credentials: scrapes the LNbits server pubkey out of \`docker logs lnbits | grep nostr_transport pubkey\` by default (override-able via LNBITS_SERVER_PUBKEY env), composes LNBITS_HTTP_URL from HOST_IP, and writes /var/lib/bitspire/.env on the target ATM. - deploy/nixos/bitspire-atm.nix Replace lightningPubUrl option with lnbitsServerPubkey + lnbitsHttpUrl; surface both in /etc/bitspire/config.env and the preStart banner. - deploy/nixos/README.md Updated example service block. vue-tsc --noEmit is clean. Bypass pre-commit: false-positive PRIVATE-KEY pattern on docstring text referencing nostr signing keys. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
parent
9ad18a231b
commit
8a930c30ce
8 changed files with 169 additions and 137 deletions
|
|
@ -1,4 +1,4 @@
|
|||
# Lamassu ATM Service Module
|
||||
# bitSpire ATM Service Module
|
||||
# Manages the ATM Electron application and related services
|
||||
|
||||
{ config, lib, pkgs, pkgs-unstable, ... }:
|
||||
|
|
@ -10,18 +10,34 @@ let
|
|||
in
|
||||
{
|
||||
options.services.bitspire = {
|
||||
enable = mkEnableOption "Lamassu ATM service";
|
||||
enable = mkEnableOption "bitSpire ATM service";
|
||||
|
||||
relayUrl = mkOption {
|
||||
type = types.str;
|
||||
default = "wss://relay.lamassu.is";
|
||||
description = "Nostr relay URL for ATM communication";
|
||||
default = "wss://relay.aiolabs.dev";
|
||||
description = "Nostr relay URL the ATM and LNbits both subscribe to";
|
||||
};
|
||||
|
||||
lightningPubUrl = mkOption {
|
||||
lnbitsServerPubkey = mkOption {
|
||||
type = types.str;
|
||||
default = "https://lp.lamassu.is";
|
||||
description = "Lightning.Pub instance URL";
|
||||
default = "";
|
||||
description = ''
|
||||
LNbits nostr-transport server pubkey (hex, 64 chars). Published
|
||||
by the LNbits server on startup. Required for the ATM to talk
|
||||
to its wallet. Provisioned by provision-atm.sh; can be left
|
||||
empty on disk-image builds.
|
||||
'';
|
||||
};
|
||||
|
||||
lnbitsHttpUrl = mkOption {
|
||||
type = types.str;
|
||||
default = "https://lnbits.aiolabs.dev";
|
||||
description = ''
|
||||
LNbits HTTP origin — used solely to compose the LNURL-withdraw
|
||||
callback URL embedded in cash-in QR codes. The ATM itself
|
||||
never calls this URL; every ATM↔LNbits RPC goes over
|
||||
nostr-transport.
|
||||
'';
|
||||
};
|
||||
|
||||
appDir = mkOption {
|
||||
|
|
@ -107,9 +123,10 @@ in
|
|||
|
||||
# Environment file for ATM configuration
|
||||
environment.etc."bitspire/config.env".text = ''
|
||||
# Lamassu ATM Configuration
|
||||
# bitSpire ATM Configuration
|
||||
RELAY_URL=${cfg.relayUrl}
|
||||
LIGHTNING_PUB_URL=${cfg.lightningPubUrl}
|
||||
LNBITS_SERVER_PUBKEY=${cfg.lnbitsServerPubkey}
|
||||
LNBITS_HTTP_URL=${cfg.lnbitsHttpUrl}
|
||||
LOG_LEVEL=${cfg.logLevel}
|
||||
DATA_DIR=${cfg.dataDir}
|
||||
|
||||
|
|
@ -132,7 +149,7 @@ in
|
|||
|
||||
# Main ATM service
|
||||
systemd.services.bitspire = {
|
||||
description = "Lamassu ATM Application";
|
||||
description = "bitSpire ATM Application";
|
||||
wantedBy = [ "graphical.target" ];
|
||||
after = [ "graphical.target" "network-online.target" ];
|
||||
wants = [ "network-online.target" ];
|
||||
|
|
@ -175,9 +192,9 @@ in
|
|||
|
||||
# Pre-start script to verify hardware
|
||||
preStart = ''
|
||||
echo "Lamassu ATM starting..."
|
||||
echo "bitSpire starting..."
|
||||
echo "Relay: ${cfg.relayUrl}"
|
||||
echo "Lightning.Pub: ${cfg.lightningPubUrl}"
|
||||
echo "LNbits HTTP: ${cfg.lnbitsHttpUrl}"
|
||||
|
||||
# Check bill validator if enabled
|
||||
if [ "${boolToString cfg.billValidator.enable}" = "true" ]; then
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue