deploy_nixos: add var.target_port (#34)

Author: betaboon

deploy_nixos/main.tf

@@ -7,6 +7,12 @@ variable "target_host" {
   description = "DNS host to deploy to"
 }
 
+variable "target_port" {
+  description = "SSH port used to connect to the target_host"
+  type        = number
+  default     = 22
+}
+
 variable "ssh_private_key_file" {
   description = "Path to private key used to connect to the target_host. Ignored if `-` or empty."
   default     = "-"
@@ -113,6 +119,7 @@ resource "null_resource" "deploy_nixos" {
   connection {
     type        = "ssh"
     host        = var.target_host
+    port        = var.target_port
     user        = var.target_user
     agent       = var.ssh_agent
     timeout     = "100s"
@@ -155,6 +162,7 @@ resource "null_resource" "deploy_nixos" {
       data.external.nixos-instantiate.result["drv_path"],
       data.external.nixos-instantiate.result["out_path"],
       "${var.target_user}@${var.target_host}",
+      "${var.target_port}",
       local.build_on_target,
       local.ssh_private_key_file,
       "switch",

deploy_nixos/nixos-deploy.sh

@@ -30,15 +30,18 @@ sshOpts=(
 drvPath="$1"
 outPath="$2"
 targetHost="$3"
-buildOnTarget="$4"
-sshPrivateKeyFile="$5"
-action="$6"
-shift 6
+targetPort="$4"
+buildOnTarget="$5"
+sshPrivateKeyFile="$6"
+action="$7"
+shift 7
 
 # remove the last argument
 set -- "${@:1:$(($# - 1))}"
 buildArgs+=("$@")
 
+sshOpts+=( -p "${targetPort}" )
+
 if [[ -n "${sshPrivateKeyFile}" && "${sshPrivateKeyFile}" != "-" ]]; then
     sshOpts+=( -o "IdentityFile=${sshPrivateKeyFile}" )
 fi