From a74a7ca0b5c4f06e2dfb1c81dbae781bc2131ce6 Mon Sep 17 00:00:00 2001 From: Victor Hugo Aguiar Pacce Date: Thu, 11 Apr 2024 15:20:51 -0300 Subject: [PATCH] Allow installs through terraform to work on different ports Signed-off-by: Victor Hugo Aguiar Pacce --- terraform/all-in-one/main.tf | 1 + terraform/install/main.tf | 1 + terraform/install/run-nixos-anywhere.sh | 2 ++ 3 files changed, 4 insertions(+) diff --git a/terraform/all-in-one/main.tf b/terraform/all-in-one/main.tf index b25cbf3e..2b073985 100644 --- a/terraform/all-in-one/main.tf +++ b/terraform/all-in-one/main.tf @@ -45,6 +45,7 @@ module "nixos-rebuild" { ssh_private_key = var.deployment_ssh_key target_host = var.target_host target_user = var.target_user + target_port = var.target_port } output "result" { diff --git a/terraform/install/main.tf b/terraform/install/main.tf index 02e6da09..3818e14c 100644 --- a/terraform/install/main.tf +++ b/terraform/install/main.tf @@ -16,6 +16,7 @@ resource "null_resource" "nixos-remote" { nixos_system = var.nixos_system target_user = var.target_user target_host = var.target_host + target_port = var.target_port extra_files_script = var.extra_files_script no_reboot = var.no_reboot build_on_remote = var.build_on_remote diff --git a/terraform/install/run-nixos-anywhere.sh b/terraform/install/run-nixos-anywhere.sh index 86f72fa0..b11cfdfc 100755 --- a/terraform/install/run-nixos-anywhere.sh +++ b/terraform/install/run-nixos-anywhere.sh @@ -48,6 +48,8 @@ if [[ ${extra_files_script-} != "" ]]; then popd args+=("--extra-files" "${tmpdir}/extra-files") fi + +args+=("-p" "${target_port}") args+=("${target_user}@${target_host}") keyIdx=0