Jonas Nick
693c646c49
Merge fort-nix/nix-bitcoin#402 : Misc. improvements
...
6d694a62690c45415c860853dedc43b73c093d3d27905e2c3ac8251cdad73c6a664b7b4d5bc810ebe61c7436442cf12d8765e57ab83a511b597f92a6a92d6a8e80f36df8f56309169365d882d910e937f61e9281391848c3dd98e5616376006d694a62696d694a6269
2021-10-06 13:21:56 +00:00
Erik Arvstedt
6d694a6269
backups: allow extraFiles to override default settings
...
By moving them to the top they take precedence over the remaining
filelist entries.
2021-10-06 11:27:52 +02:00
Erik Arvstedt
0c45415c86
backups: exclude bitcoind, liquidd txindex data
2021-10-06 11:27:52 +02:00
Erik Arvstedt
0853dedc43
tests/regtest: don't fail when restarting bitcoind
2021-10-06 11:27:52 +02:00
Erik Arvstedt
b73c093d3d
joinmarket-ob-watcher: require nix-bitcoin.service
...
This caused failures in the tests which were ignored because
ob-watcher was expected to fail for other reasons.
2021-10-06 11:27:47 +02:00
Erik Arvstedt
27905e2c3a
tests: disable restarting joinmarket-ob-watcher
...
This removes the repeated failure messages from the test log.
2021-10-05 16:45:00 +02:00
Erik Arvstedt
c8251cdad7
onion-services: don't always enable Tor
...
Previously, Tor was always enabled because `cfg` was always nonempty
(via definitions at `Set sensible defaults for some services`).
Now only enable Tor if there are active onion services.
Also rename var `services` -> `onionServices` to improve readability in
section `Set getPublicAddressCmd ...` where the same name is also used for
option `config.services`.
2021-10-05 15:11:41 +02:00
Erik Arvstedt
3c6a664b7b
examples/configuration: show how to enable sudo/doas for operator
...
This was brought up by a user on IRC.
2021-10-04 00:33:27 +02:00
Erik Arvstedt
4d5bc810eb
secrets: fix setup-secrets in case of no secrets
...
Previously, the glob (*) returned '*' when no files existed in the
secrets dir, leading to error `chown: cannot access '*'`.
Now `unprocessedFiles` is empty when there are no secrets.
Also remove the unneeded sorting of `unprocessedFiles` and
remove redundant leading zero in the default mode.
2021-10-04 00:33:27 +02:00
Erik Arvstedt
e61c743644
test: add option extraTestScript
...
This allows extending tests.py.
2021-10-04 00:33:27 +02:00
Erik Arvstedt
2cf12d8765
README: minor fixes
...
- `packages and dependencies are pinned`
Reworded and moved to `Integrity`
- `most packages are built from the NixOS stable channel...`
Removed because this is false
- `builds happen in a sandboxed environment`
Removed because this depends on the user's local nix configuration
and cannot be enforced by nix-bitcoin
2021-10-04 00:33:27 +02:00
Erik Arvstedt
e57ab83a51
docs/hardware: update
...
- Update pruning info
- Add Raspberry Pi 4
Mentioned here: https://github.com/fort-nix/nix-bitcoin/issues/39#issuecomment-917418830
2021-10-04 00:33:27 +02:00
Erik Arvstedt
1b597f92a6
docs/hardware: add line breaks
2021-10-04 00:33:27 +02:00
Erik Arvstedt
a92d6a8e80
netns: expose bridgeIp as an option
...
Previously, this variable was not accessible to other modules.
2021-10-04 00:33:26 +02:00
Erik Arvstedt
f36df8f563
secure-node: remove redundant bitcoind settings
...
- `discover` is automatically disabled by bitcoind because we're
setting `externalip` via the `nix-bitcoin.onionServices` mechanism
- `bech32` is bitcoind's default addresstype
2021-10-04 00:33:26 +02:00
Erik Arvstedt
09169365d8
liquid: remove unused features
...
- `hexStr` is unused
- Simplify ExecStart options
- Quote `dataDir`
- Remove unneeded `pidFile` setting
2021-10-04 00:33:26 +02:00
Erik Arvstedt
82d910e937
nbxplorer: fix bitcoind, liquidd settings
...
- Add nbxplorer to whitelists.
This is recommended by the nbxplorer docs and guarantees that nbxplorer
can always p2p-connect to bitcoind/liquidd.
- Enable bitcoind/liquidd p2p servers via `listen`.
2021-10-04 00:33:26 +02:00
Erik Arvstedt
f61e928139
services: support 0.0.0.0/:: in address options
...
Previously, client services didn't decode these special INADDR_ANY
addresses and failed to connect.
2021-10-04 00:33:26 +02:00
Erik Arvstedt
1848c3dd98
btcpayserver: minor improvements
...
- Quote datadir
- Extract liquidd service variable
- Move btcpayserver below liquid in modules list because it depends
on liquid
2021-10-01 11:52:57 +02:00
Erik Arvstedt
e561637600
minor fixes
...
- bitcoind: Remove obsolete defaultText
- clightning: Fix description
Option `address` can't be used to specify a socket path because it's
used explicitly as an IP address in many places.
- lnd: Break up overlong line
This is required by commit `services: support 0.0.0.0/:: in `address` options`
- nix-bitcoin.nix: Formatting
- secrets: Improve descriptions
2021-10-01 11:52:56 +02:00
Jonas Nick
e86d1ff0ff
Merge fort-nix/nix-bitcoin#399 : examples: Fix shell on non-Linux systems
...
46af0b1a8d46af0b1a8d
2021-09-27 09:14:44 +00:00
Jonas Nick
a4ac735cd3
Merge fort-nix/nix-bitcoin#396 : examples: add importable-configuration.nix
...
2a16db6919d713e7b15c2a16db6919
2021-09-27 09:11:21 +00:00
Erik Arvstedt
46af0b1a8d
examples: fix shell on non-Linux systems
...
extra-container is not supported on these systems.
Also mention that VM examples require Linux.
2021-09-26 23:58:46 +02:00
Erik Arvstedt
2a16db6919
readme: add 'Get started' section
...
Also, shorten the overview a bit by removing some redundancy:
- Remove sentence 'A Bitcoin node verifies ... network.' because
its content is implied by the use cases (wallet, public infrastructure) mentioned in the
following sentence.
- 'second layer public infrastructure' -> 'public infrastructure',
because we're also serving the first layer.
2021-09-26 22:34:39 +02:00
Erik Arvstedt
d713e7b15c
examples: add importable-configuration.nix
...
This replaces minimal-configuration.nix.
importable-configuration.nix can be directly added to an existing
NixOS configuration. This makes it easy for users to get started quickly.
2021-09-26 22:34:39 +02:00
Jonas Nick
5626558222
Merge fort-nix/nix-bitcoin#397 : backups: make extraFiles list of strings
...
c483f1694dcb54891484c483f1694d
2021-09-25 10:34:51 +00:00
nixbitcoin
c483f1694d
examples: correct localBackups scp command
2021-09-24 11:51:33 +00:00
nixbitcoin
cb54891484
backups: make extraFiles list of strings
2021-09-24 11:38:47 +00:00
Jonas Nick
c72f6b0a31
Merge fort-nix/nix-bitcoin#393 : Update nixpkgs
...
e94e071ad60c31130ac8e94e071ad6e94e071ad6
2021-09-20 15:48:56 +00:00
Jonas Nick
e94e071ad6
update nixpkgs
...
bitcoin: 0.21.1 -> 22.0
bitcoind: 0.21.1 -> 22.0
electrs: 0.8.10 -> 0.8.11
2021-09-19 20:07:55 +00:00
Jonas Nick
0c31130ac8
secure-node: remove default bitcoin addnode
...
Onion v2 addresses are incompatible with the upcoming bitcoind version.
2021-09-19 20:03:40 +00:00
Jonas Nick
020d9486dd
Merge fort-nix/nix-bitcoin#388 : Modules formatting
...
9114ec669ac8774375d3ad97c268c627c45b82cc731cf647ff9114ec669a
2021-09-19 11:28:17 +00:00
Erik Arvstedt
9114ec669a
lnd: improve options formatting
2021-09-16 12:51:00 +02:00
Jonas Nick
6b4b74bbac
Merge fort-nix/nix-bitcoin#391 : examples/shell.nix: Add shell version variable
...
1f8f2b21391f8f2b2139
2021-09-15 10:27:18 +00:00
Erik Arvstedt
1f8f2b2139
examples/shell.nix: Add shell version variable
...
This simplifies future shell upgrades.
2021-09-15 12:22:10 +02:00
Jonas Nick
6bf6c225e2
Merge fort-nix/nix-bitcoin#389 : examples/shell.nix: Add upgrade note for NixOps users
...
0186b2a7640186b2a764
2021-09-15 10:08:03 +00:00
Erik Arvstedt
0186b2a764
examples/shell.nix: Add upgrade note for NixOps users
2021-09-15 12:01:37 +02:00
Jonas Nick
ed8792c72b
Merge fort-nix/nix-bitcoin#387 : Shell improvements
...
b49c74545f7356a34d8877af2e453852aaa8388eb49c74545f
2021-09-15 09:00:49 +00:00
Jonas Nick
5c88be3403
Merge fort-nix/nix-bitcoin#383 : update nixpkgs
...
3e146512d77008a5118a3e146512d7
2021-09-15 08:25:38 +00:00
nixbitcoin
3e146512d7
joinmarket: add copy of twisted 20.3.0
2021-09-14 20:06:35 +00:00
Jonas Nick
7008a5118a
update nixpkgs
...
btcpayserver: 1.2.0 -> 1.2.3
charge-lnd: 0.2.3 -> 0.2.4
nbxplorer: 2.1.58 -> 2.2.5
2021-09-14 20:06:27 +00:00
Erik Arvstedt
b49c74545f
fetch-release: make GPG key searchable
...
The non-spaced version gives no matches in major search engines.
This is useful for auditing this script.
2021-09-14 19:56:35 +02:00
Erik Arvstedt
7356a34d88
docs/install.md: update
2021-09-14 19:56:35 +02:00
Erik Arvstedt
77af2e4538
makeShell: improve update-nix-bitcoin
...
- Don't overwrite `nix-bitcoin-release.nix` on errors
- Show a message to indicate whether `nix-bitcoin-release.nix` was
updated
- Don't start a shell when called noninteractively
Also, update `usage.md` and reformat `shell.nix`.
2021-09-14 19:56:35 +02:00
Erik Arvstedt
52aaa8388e
fetch-release: write error messages to stderr
...
Previously, when used to update `nix-bitcoin-release`, the error
wasn't displayed but instead written to `nix-bitcoin-release`.
Also, show curl error messages.
2021-09-14 19:56:23 +02:00
Erik Arvstedt
c8774375d3
modules: use consistent service variables
...
Benefits of adding top-level variables for used services:
- Makes it obvious which other services are referenced by a service
- Less code
We already do this in many other places.
2021-09-13 13:41:47 +02:00
Erik Arvstedt
ad97c268c6
modules: move user/group options to bottom
...
These are insignificant, generic options; place them above readonly options.
We already do this in other services.
Also move user/group config to bottom in spark-wallet.
2021-09-13 13:41:47 +02:00
Erik Arvstedt
27c45b82cc
modules: move options to the top
...
This greatly improves readability and makes it easier to discover options.
This commit was genereated by running the following script inside the
repo root dir:
#!/usr/bin/env ruby
def transform(src)
return false if src.include?('inherit options;')
success = false
options = nil
src.sub!(/^ options.*?^ }.*?;/m) do |match|
options = match
" inherit options;"
end
return false if !options
src.sub!(/^with lib;\s*let\n+/m) do |match|
success = true
<<~EOF
with lib;
let
#{options}
EOF
end
success
end
Dir['modules/**/*.nix'].each do |f|
src = File.read(f)
if transform(src)
puts "Changed file #{f}"
File.write(f, src)
end
end
2021-09-13 13:41:47 +02:00
Erik Arvstedt
731cf647ff
modules: remove unneeded use of options module arg
...
Needed by the following commit.
2021-09-13 13:41:47 +02:00
Jonas Nick
cf70d05be0
Merge fort-nix/nix-bitcoin#385 : Misc. improvments
...
fdcb68e96ea2466b112724fd1e9bdc8a757e048682a2b148d8e1e3d8a92b2c8e29b35bbe12a49933955b44404c5087ce245f0d2db4e79ffdcb68e96efdcb68e96e
2021-09-12 13:22:10 +00:00
