From 18e236d89dd72b89cc8fe19c15c73b9e87985c31 Mon Sep 17 00:00:00 2001 From: Adriano Di Luzio Date: Mon, 26 May 2025 07:52:52 +0200 Subject: [PATCH 1/2] nixos/prometheus.exporters.bitcoin: fix SC2155 Declare and assign separately `BITCOIN_RPC_PASSWORD` to avoid masking return values. This will have the service fail at startup if `cfg.rpcPasswordFile` does not exist. Ref: https://www.shellcheck.net/wiki/SC2155 --- .../services/monitoring/prometheus/exporters/bitcoin.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/monitoring/prometheus/exporters/bitcoin.nix b/nixos/modules/services/monitoring/prometheus/exporters/bitcoin.nix index ca1e0f7aaa95..246381459c56 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/bitcoin.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/bitcoin.nix @@ -75,7 +75,8 @@ in }; serviceOpts = { script = '' - export BITCOIN_RPC_PASSWORD=$(cat ${cfg.rpcPasswordFile}) + BITCOIN_RPC_PASSWORD=$(cat ${cfg.rpcPasswordFile}) + export BITCOIN_RPC_PASSWORD exec ${cfg.package}/bin/bitcoind-monitor.py ''; From 3be190a1fc7a91ca0f3ceed8f354f1d3a22f9a78 Mon Sep 17 00:00:00 2001 From: Adriano Di Luzio Date: Mon, 26 May 2025 07:55:49 +0200 Subject: [PATCH 2/2] nixos/prometheus.exporters.bitcoin: remove unused attributes --- .../services/monitoring/prometheus/exporters/bitcoin.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/nixos/modules/services/monitoring/prometheus/exporters/bitcoin.nix b/nixos/modules/services/monitoring/prometheus/exporters/bitcoin.nix index 246381459c56..af95a0bc59bd 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/bitcoin.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/bitcoin.nix @@ -2,13 +2,12 @@ config, lib, pkgs, - options, ... }: let cfg = config.services.prometheus.exporters.bitcoin; - inherit (lib) mkOption types concatStringsSep; + inherit (lib) mkOption types; in { port = 9332;