diff --git a/deploy_nixos/main.tf b/deploy_nixos/main.tf index 862cb4f..ae5c113 100644 --- a/deploy_nixos/main.tf +++ b/deploy_nixos/main.tf @@ -194,14 +194,16 @@ resource "null_resource" "deploy_nixos" { data.external.nixos-instantiate.result["out_path"], "${var.target_user}@${var.target_host}", var.target_port, - local.build_on_target, - local.ssh_private_key == "" ? "-" : local.ssh_private_key, "switch", var.delete_older_than, ], local.extra_build_args ) command = "ignoreme" + environment = { + BUILD_ON_TARGET = local.build_on_target + SSH_PRIVATE_KEY = local.ssh_private_key == "" ? "-" : local.ssh_private_key + } } } diff --git a/deploy_nixos/nixos-deploy.sh b/deploy_nixos/nixos-deploy.sh index 319651b..89454c5 100755 --- a/deploy_nixos/nixos-deploy.sh +++ b/deploy_nixos/nixos-deploy.sh @@ -24,17 +24,18 @@ sshOpts=( -v ) +buildOnTarget="${BUILD_ON_TARGET:-}" +sshPrivateKey="${SSH_PRIVATE_KEY:--}" + ### Argument parsing ### drvPath="$1" outPath="$2" targetHost="$3" targetPort="$4" -buildOnTarget="$5" -sshPrivateKey="$6" -action="$7" -deleteOlderThan="$8" -shift 8 +action="$5" +deleteOlderThan="$6" +shift 6 # remove the last argument set -- "${@:1:$(($# - 1))}"