Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
.direnv
**/producer
**/result
**/result
**/*.qcow2
9 changes: 6 additions & 3 deletions modules/block-producer-node/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,9 @@ in
};

configFilesPath = lib.mkOption {
type = lib.types.path;
description = "Path to the network configuration directory";
type = lib.types.nullOr lib.types.path;
default = null;
description = "Path to the network configuration directory. Optional, will use cardano-node service configuration if set to null.";
};
};
};
Expand All @@ -45,9 +46,11 @@ in
services.cardano-node = mkMerge [
{
enable = true;
}
(mkIf (cfg.configFilesPath != null) {
nodeConfigFile = "${cfg.configFilesPath}/configuration.yaml";
topology = "${cfg.configFilesPath}/topology-spo-1.json";
}
})
(mkIf (cfg.block-producer-key-path != null) {
signingKey = "${cfg.block-producer-key-path}/byron-gen-command/delegate-keys.000.key";
delegationCertificate = "${cfg.block-producer-key-path}/byron-gen-command/delegation-cert.000.json";
Expand Down
6 changes: 3 additions & 3 deletions modules/install-script/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
enable =
mkEnableOption "Create deployment script at `config.system.build.spoInstallScript`."
// {default = config.spo-anywhere.enable or false;};
target-dns = mkOption {
target = mkOption {
type = nullOr str;
default = null;
example = "root@128.196.0.1";
Expand Down Expand Up @@ -47,7 +47,7 @@
rm -rf "$tmp_keys"
}

target="${builtins.toString (config.spo-anywhere.install-script.target-dns or "")}"
target="${builtins.toString (config.spo-anywhere.install-script.target or "")}"

# todo: make target optional option

Expand Down Expand Up @@ -99,7 +99,7 @@
# 4. use scp instead
nixos-anywhere \
--debug \
--store-paths ${config.system.build.diskoScript} ${config.system.build.toplevel} \
--store-paths ${config.system.build.diskoScript} ${config.system.build.toplevel} \
--kexec ${kexec-installer} \
-i "$ssh_key" \
--copy-host-keys \
Expand Down
Loading