From 073161b0443e59d19e0f8d3775faeddd61aaa73f Mon Sep 17 00:00:00 2001 From: Erik Arvstedt Date: Sun, 9 Jul 2023 16:17:25 +0200 Subject: [PATCH 1/6] secrets: add comment --- modules/secrets/secrets.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/secrets/secrets.nix b/modules/secrets/secrets.nix index be3e7b4..55540d3 100644 --- a/modules/secrets/secrets.nix +++ b/modules/secrets/secrets.nix @@ -80,6 +80,7 @@ let rpcauth = pkgs.writers.writeBash "rpcauth" '' exec ${pkgs.python3}/bin/python ${rpcauthSrc} "$@" ''; + # Writes secrets to PWD in pkgs.writers.writeBash "generate-secrets" '' set -euo pipefail From 8303a65f0c56b3dff0e223129a19a2675ae4ddb9 Mon Sep 17 00:00:00 2001 From: Erik Arvstedt Date: Sun, 23 Jul 2023 10:38:26 +0200 Subject: [PATCH 2/6] configuration.nix: add nodeinfo --- examples/configuration.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/examples/configuration.nix b/examples/configuration.nix index 5db7bb9..5406e78 100644 --- a/examples/configuration.nix +++ b/examples/configuration.nix @@ -230,6 +230,12 @@ # Set this to enable the JoinMarket order book watcher. # services.joinmarket-ob-watcher.enable = true; + ### Nodeinfo + # Set this to add command `nodeinfo` to the system environment. + # It shows info about running services like onion addresses and local addresses. + # It is enabled by default when importing `secure-node.nix`. + # nix-bitcoin.nodeinfo.enable = true; + ### Backups # Set this to enable nix-bitcoin's own backup service. By default, it # uses duplicity to incrementally back up all important files in /var/lib to From 32ce2b567c4fc525c14413ca04b27f5d25598877 Mon Sep 17 00:00:00 2001 From: Erik Arvstedt Date: Fri, 21 Jul 2023 12:05:39 +0200 Subject: [PATCH 3/6] examples/README: make relative location of configuration.nix explicit --- examples/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/README.md b/examples/README.md index d7c9d39..6825c94 100644 --- a/examples/README.md +++ b/examples/README.md @@ -23,9 +23,9 @@ cd nix-bitcoin/examples/ nix-shell ``` -The following example scripts set up a nix-bitcoin node according to [`configuration.nix`](configuration.nix) and then +The following example scripts set up a nix-bitcoin node according to [`./configuration.nix`](configuration.nix) and then shut down immediately. They leave no traces (outside of `/nix/store`) on the host system.\ -By default, [`configuration.nix`](configuration.nix) enables `bitcoind` and `clightning`. +By default, [`./configuration.nix`](configuration.nix) enables `bitcoind` and `clightning`. - [`./deploy-container.sh`](deploy-container.sh) creates a [NixOS container](https://github.com/erikarvstedt/extra-container).\ This is the fastest way to set up a node.\ From c22365d4a238dbc06a673d4a66c7c841c4b368e1 Mon Sep 17 00:00:00 2001 From: Erik Arvstedt Date: Fri, 21 Jul 2023 12:07:52 +0200 Subject: [PATCH 4/6] minimal-vm.nix: improve login text - Add `bitcoin-cli` cmd - Remove leading dashes to for easier copying and pasting --- examples/qemu-vm/minimal-vm.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/examples/qemu-vm/minimal-vm.nix b/examples/qemu-vm/minimal-vm.nix index a639d0f..32ee7c9 100644 --- a/examples/qemu-vm/minimal-vm.nix +++ b/examples/qemu-vm/minimal-vm.nix @@ -40,10 +40,11 @@ rec { Welcome to nix-bitcoin! To explore running services, try the following commands: - - nodeinfo - - systemctl status bitcoind - - systemctl status clightning - - lightning-cli getinfo + nodeinfo + systemctl status bitcoind + systemctl status clightning + bitcoin-cli -getinfo + lightning-cli getinfo ''; # Power off VM when the user exits the shell From 7dcf307925e6fb99f18bf065d3a0ccc6689a0b07 Mon Sep 17 00:00:00 2001 From: Erik Arvstedt Date: Wed, 26 Oct 2022 09:32:54 +0200 Subject: [PATCH 5/6] flake-info-sandboxed: clarify that sandbox is offline --- test/nixos-search/flake-info-sandboxed.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/nixos-search/flake-info-sandboxed.sh b/test/nixos-search/flake-info-sandboxed.sh index 2b664e0..2bf6bb8 100755 --- a/test/nixos-search/flake-info-sandboxed.sh +++ b/test/nixos-search/flake-info-sandboxed.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash set -euo pipefail -# Run flake-info for the nix-bitcoin flake in a sandbox: +# Run flake-info for the nix-bitcoin flake in an offline sandbox: # - Adds a consistent, reproducible runtime environment # - Removes the need to trust the flake-info binary # From 27e52fc565e3bb2e511a505d7d247d147e86fb04 Mon Sep 17 00:00:00 2001 From: Erik Arvstedt Date: Sat, 19 Aug 2023 12:08:49 +0200 Subject: [PATCH 6/6] dev-scenarios: fix comment --- dev/dev-scenarios.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev/dev-scenarios.nix b/dev/dev-scenarios.nix index 37b1744..21f5991 100644 --- a/dev/dev-scenarios.nix +++ b/dev/dev-scenarios.nix @@ -37,7 +37,7 @@ with lib; extraConfig.Settings.themeColor = "INDIGO"; }; # nodes.lnd.enable = false; - # services.rtl.nodes.reverseOrder = true; + # nodes.reverseOrder = true; nightTheme = true; extraCurrency = "CHF"; };