323b2a7f17da7f2717ecfecb3fe1cc8d75be11de Allow adding multiple nodes to bitcoind with the addnodes option and improve bitcoin module option descriptions (Jonas Nick)
ed6511c96e6a83e4f856fb6a7bd5bf21d8239aaa Document how to override attributes in configuration.nix (Jonas Nick)
9d3588e1de8e3fd516859f3beb7be3b0b628793f Convert nix-bitcoin extraConfig options to regular options (Jonas Nick)
Pull request description:
Top commit has no ACKs.
Tree-SHA512: 02d7a38e41742f76979e2e12ae2195304a11a86c6547f5e1f3ff82b6031ad36b80d006a78cb4ec03fdfc4227ffdd60c5cc15bf898c32a3f213acaf2598da8eaf
ProtectSystem=full disables writing to /etc which is the default
secrets location.
Besides that, hardening is pointless for {generate,setup}-secrets which
don't read external input and are fully under our control.
31ad56950f6d35ba530942c814629a25b057f8f8 CI build: print number of VM CPUs (Erik Arvstedt)
Pull request description:
ACKs for top commit:
jonasnick:
ACK 31ad56950f6d35ba530942c814629a25b057f8f8
Tree-SHA512: ff6c43d24f4121d0f1a89e82bb58e182ba044662cb00e7fc879168e7f697d171bc6fbed5d22d983fc6ded11fadbbb4e433133709bf4512882412ac8908e15156
187ff884dbf064ef80ebd47a3f49ca985cb0bdf5 add modules test (Erik Arvstedt)
826245484ec0af402a54f85c8f228b29c91db1f7 make secrets dir location configurable (Erik Arvstedt)
b1e13e9415f16180cdf7f2d23c209150471aa520 simplify secrets file format (Erik Arvstedt)
314272a228f974dc41c36ba2a9f3997d35ff7361 lnd, nanopos: move user and group definitions to the bottom (Erik Arvstedt)
766fa4f300511a7f0703327248bd9cc8cdbe0c3b travis: cache all build outputs with cachix (Erik Arvstedt)
b0e759160dcd29e2dfe0bd6471d39444e7d09123 travis: set NIX_PATH as early as possible (Erik Arvstedt)
c51bbcf104d3163366b91b2dfaa3e806f31cd02a travis: move comment (Erik Arvstedt)
7092dce0c77cfbb3e2a01a670c3a7618fca2a759 travis: remove use of deprecated statements (Erik Arvstedt)
190a92507cf395a359912f777c470cdd4d6dbef5 travis: split up scripts into statements (Erik Arvstedt)
10d6b04ac82226dd8c39da492ef63f1491b2dd65 support enabling clightning and lnd simultaneously (Erik Arvstedt)
ad7a519284eed218c2c9958c141f817c2abc9e93 bitcoind: wait until RPC port is open (Erik Arvstedt)
5536b64fb3c699ad0b24d165d5f3073be357e8c5 lnd: wait until wallet is created (Erik Arvstedt)
6f2a55d63ca9b4daf70a22e31285ced720697e0c lnd: wait until RPC port is open (Erik Arvstedt)
1868bef4625a2897eb03355099e5077739d07365 lnd: add option 'rpcPort' (Erik Arvstedt)
120e3e8cfea6221371ef5a939cbcb7138e3808dc lnd postStart: suppress curl response output (Erik Arvstedt)
3e86637327663ec8745294e12faf41d9fcb4f58e lnd postStart: poll for REST service availability (Erik Arvstedt)
795c51dc01efe72b58d33085490318d5991e969e lnd postStart: make more idiomatic (Erik Arvstedt)
6e58beae8a27908f9e3e6afbe0e620b5c964c791 lnd: use postStart option for script (Erik Arvstedt)
86167c6e6d3362a02055e9045981434d29c7cca5 clightning: wait until the RPC socket appears (Erik Arvstedt)
60c732a6a1cbbe8b6112f3517140f03481c97956 onion-chef: set RemainAfterExit, fix tor dependency (Erik Arvstedt)
2b9b3ba1c500e51c86c6cfb06fd49febe56e455d systemPackages: improve readability with shorter service references (Erik Arvstedt)
14ecb5511a29f61adacd0d4b45cf0c741604d138 liquid: add cli option (Erik Arvstedt)
cd5ed39b9cdde341325170c7e27b4ea0c9aca302 lnd: add cli option (Erik Arvstedt)
1833b158883cce8886cbeb21eab4e29ab267f3fb clightning: add cli option (Erik Arvstedt)
b90bf6691bf7f7bb53c1dd1ede188186bb141905 add generate-secrets.service (Erik Arvstedt)
644769421481818025419fe1f4274f9dc49fbd24 add generate-secrets pkg (Erik Arvstedt)
e34093a8aca06bbd1107bf90990869250a9de32d generate_secrets.sh: add opensslConf option (Erik Arvstedt)
9d14d5ba64a95c1154ec70c2d91440ddf16250d5 generate_secrets.sh: write secrets to working directory (Erik Arvstedt)
51fb0540017a1ae4a274ac5f24279799cde46f12 generate_secrets.sh: extract makepw command (Erik Arvstedt)
e3b47ce18a2183bc25c60072b5bf761e6ae4a51d add setup-secrets.service (Erik Arvstedt)
437b268433e7311f47de63ded2c066fe1a8c3567 extract make-secrets.nix (Erik Arvstedt)
f9c29b9318f4c20f4bf8a132f533b9b3e98886b4 simplify secret definitions (Erik Arvstedt)
cd0fd6926ba6f1223a3dc3d41dc49380853fb752 don't copy secret files to store during nixops deployment (Erik Arvstedt)
f0a36fe0c7415272db92f772733dc4d97b57cc58 add 'nix-bitcoin-services' option (Erik Arvstedt)
7aaf30501c570c31971f4a04bdfd7a9fa9217aeb nix-bitcoin-services: simplify formatting (Erik Arvstedt)
760da232e0145fed1016e1efa9bd7dca49d22631 add nix-bitcoin pkgs namespace (Erik Arvstedt)
6def181dbc28bbab431c132a475b931df4aac16a add modules.nix (Erik Arvstedt)
3b842e5fe773b9031b15ea2d0ae05749df079d02 add nix-bitcoin-secrets.target (Erik Arvstedt)
bbf2bbc04a80f951768860d7eba5b37fc067921d network.nix: simplify import of main config (Erik Arvstedt)
7e021a26295e345c6676f598448baaadc9ff33f0 simplify overlay.nix (Erik Arvstedt)
07dc3e04ac8a56b5200de64dab34ed8aac39e45e move bitcoinrpc group definition to bitcoind (Erik Arvstedt)
d61b185c3a03c67218a5b09a2e221978f82434ac simplify user and group definitions (Erik Arvstedt)
Pull request description:
The nix-bitcoin modules consist of three fundamental components:
1. a set of bitcoin-related modules for general use.
2. an opinionated configuration of these modules (`nix-bitcoin.nix`), to be deployed on a
dedicated machine.
3. machinery for nixops deployment.
This PR removes dependencies that reach from top to bottom in the list.
This means that 1. is now usable on its own and that 2. can be used without 3.
Besides improving nix-bitcoin's general usefulness, this
- simplifies testing. This PR includes a Travis-enabled modules test using the NixOS testing framework.
- paves the way for krops deployment.
- unlocks direct deployment in NixOS containers which allows for super fast experimentation.
### Details
Here are the unnecessary inter-component dependencies and how they're resolved by the commits. I'm using the numbering from the list above.
- `1. -> 3.` The modules (1.) use the nixops-specific (3.) `keys` group.
Resolved by `add nix-bitcoin-secrets.target`.
- `1. -> 3.` 1. requires nixops-specific key services.
Resolved by `add nix-bitcoin-secrets.target`.
- `1. -> 2.` bitcoind needs the bitcoinrpc group which is defined in `nix-bitcoin.nix` (2.).
Resolved by `move bitcoinrpc group definition to bitcoind`.
Further obstacles for standalone usage of 1.:
- We can't easily import 1. as a standalone module set.
Resolved by `add modules.nix`.
- Users of 1. shouldn't be forced to import nix-bitcoin's packages as top-level items in the pkgs namespace.
Resolved by `add nix-bitcoin pkgs namespace`.
### Non-nixops deployments
Commit `add setup-secrets.service` simplifies non-nixops deployment methods like containers, NixOS VMs or krops.
Secrets can now deployed as follows:
1. create local secrets.
2. transfer secrets to machine.
3. on the machine, `setup-secrets.service` creates extra secrets from `secrets.nix` and sets owner and
permissions for all secrets.
As krops integrates step 2. we now have all ingredients for automatic krops deployment.
The service is complicated by the creation of secrets like `bitcoin-rpcpassword` that are composed of attrs from `secrets.nix` instead of being simply backed by a file like `lnd_key`. We could simplify this by creating all secret files locally.
Running nix-bitcoin in NixOS containers gives you faster rebuild cycles when developing. [Here's](https://gist.github.com/5db4fa7dd3f1137920b58e39647116f6) an example.
### Test
The last commits starting with `clightning: add cli option` are testing-related and mostly fix non-critical bugs that were exposed by the test.
All `STABLE=1` builds from the Travis build matrix are implicit in the modules test.
Should we remove these individual builds?
Regarding commit `travis: cache all build outputs with cachix`:
To replace my cache with a cache that's owned by you (maybe named `nix-bitcoin-ci`), run
```
nix-shell -p travis --run 'travis encrypt CACHIX_SIGNING_KEY=... -r fort-nix/nix-bitcoin'
```
where `...` is the value of `secretKey` in `~/.config/cachix/cachix.dhall`. Let me know the travis secret and I'll fixup the commit.
### Docs
If you like the proposed changes, I'll add another PR with updates to the docs regarding the project layout, non-nixops deployment, and how to use nix-bitcoin within a larger NixOS config.
ACKs for top commit:
jonasnick:
ACK 187ff884dbf064ef80ebd47a3f49ca985cb0bdf5
Tree-SHA512: f4be65215c592a4f41bb7fa991a6d8d7c463cf631b88bf53051ca57ba280e7a60b8b09d0d1521345d5b656f844daa2166fff5d00a3105077c9e263465eacfb0a
Each secret file to be deployed is now backed by one local file.
This simplifies 'setup-secrets' and the secret definitions.
Also, with the old format it was not possible to add new secrets
to secrets.nix in a simple way.
Old secrets are automatically converted to the new format when running
nix-shell.
Using the new option 'nix-bitcoin.secrets', secrets are now directly
defined by the services that use them.
This further speeds up builds, in particular the modules test in the
next commit. By checking if the expected final build output has already
been cached, we can even skip the download of cached builds.
Advantages:
- The build fails if a statement fails.
Previously, errors in all but the last statement were silently
ignored.
- The Travis log gives a fine-grained view of the output of each
statement.
Add if statements because the '[…] &&' prefix results in YAML syntax
errors.
- set -e is implicit
- coreutils are in PATH and don't have to be explicitly referenced (echo is a shell builtin anyways)
- exit 0 is unneeded ('if' statements never fail)
This better fits the semantics of this unit and allows for easier
automated testing whether the service is active.
wantedBy = bindsTo = after = tor.service is the simplest way to ensure
that this unit is always running/restarted in lockstep with tor.
Previously, onion-chef would have stayed inactive in the case
that tor was stopped and then later restarted.
An executable is more robust to use than shell aliases.
This is also a preparation for commit 'add module test' because the
NixOS testing framework makes interactive aliases hard to use: It
unsets 'PS1' which is used by programs/bash/bash.nix to detect
interactive shells.
