secrets: add option 'generateSecrets'

Move this feature from a module preset to a regular option, so that it's
easily discoverable and accessible.

Simplify the implementation of `generateSecrets` by adding it to the
existing `setup-secrets` service script.

Also rename option setup-secrets -> setupSecrets.
This commit is contained in:
Erik Arvstedt 2021-03-10 14:08:34 +01:00 committed by Jonas Nick
parent 03515a8da6
commit b701cb5603
No known key found for this signature in database
GPG key ID: 4861DBF262123605
7 changed files with 51 additions and 44 deletions

View file

@ -83,8 +83,8 @@ read -d '' src <<EOF || true
config = { pkgs, config, lib, ... }: {
imports = [
<${configuration}>
<nix-bitcoin/modules/secrets/generate-secrets.nix>
];
nix-bitcoin.generateSecrets = true;
};
};
}

View file

@ -26,8 +26,8 @@ nix-build --out-link $tmpDir/vm - <<'EOF'
imports = [
<configuration.nix>
<qemu-vm/vm-config.nix>
<nix-bitcoin/modules/secrets/generate-secrets.nix>
];
nix-bitcoin.generateSecrets = true;
};
}).vm
EOF

View file

@ -1,9 +1,10 @@
{ config, pkgs, lib, ... }: {
imports = [
<nix-bitcoin/modules/nix-bitcoin.nix>
<nix-bitcoin/modules/secrets/generate-secrets.nix>
];
nix-bitcoin.generateSecrets = true;
services.bitcoind.enable = true;
services.clightning.enable = true;