Merge #80

80: fix(rebuild): use sudo if rebuild with another user than root r=jfroche a=jfroche



Co-authored-by: Jean-François Roche <jfroche@pyxel.be>

Author: bors[bot]

terraform/nixos-rebuild/deploy.sh

@@ -2,16 +2,19 @@
 
 set -uex -o pipefail
 
-if [ "$#" -ne 3 ]; then
-  echo "USAGE: $0 NIXOS_SYSTEM TARGET_HOST TARGET_PORT" >&2
+if [ "$#" -ne 4 ]; then
+  echo "USAGE: $0 NIXOS_SYSTEM TARGET_USER TARGET_HOST TARGET_PORT" >&2
   exit 1
 fi
 
 NIXOS_SYSTEM=$1
-TARGET_HOST=$2
-TARGET_PORT=$3
+TARGET_USER=$2
+TARGET_HOST=$3
+TARGET_PORT=$4
 shift 3
 
+TARGET="${TARGET_USER}@${TARGET_HOST}"
+
 workDir=$(mktemp -d)
 trap 'rm -rf "$workDir"' EXIT
 
@@ -31,7 +34,7 @@ if [[ -n ${SSH_KEY+x} && ${SSH_KEY} != "-" ]]; then
 fi
 
 try=1
-until NIX_SSHOPTS="${sshOpts[*]}" nix copy -s --experimental-features nix-command --to "ssh://$TARGET_HOST" "$NIXOS_SYSTEM"; do
+until NIX_SSHOPTS="${sshOpts[*]}" nix copy -s --experimental-features nix-command --to "ssh://$TARGET" "$NIXOS_SYSTEM"; do
   if [[ $try -gt 10 ]]; then
     echo "retries exhausted" >&2
     exit 1
@@ -40,5 +43,9 @@ until NIX_SSHOPTS="${sshOpts[*]}" nix copy -s --experimental-features nix-comman
   try=$((try + 1))
 done
 
+switchCommand="nix-env -p /nix/var/nix/profiles/system --set $(printf "%q" "$NIXOS_SYSTEM"); /nix/var/nix/profiles/system/bin/switch-to-configuration switch"
+if [[ $TARGET_USER != "root" ]]; then
+  switchCommand="sudo bash -c '$switchCommand'"
+fi
 # shellcheck disable=SC2029
-ssh "${sshOpts[@]}" "$TARGET_HOST" "nix-env -p /nix/var/nix/profiles/system --set $(printf "%q" "$NIXOS_SYSTEM"); /nix/var/nix/profiles/system/bin/switch-to-configuration switch" || :
+ssh "${sshOpts[@]}" "$TARGET" "$switchCommand"

terraform/nixos-rebuild/main.tf

@@ -7,6 +7,6 @@ resource "null_resource" "nixos-rebuild" {
       SSH_KEY = var.ssh_private_key
     }
 
-    command = "${path.module}/deploy.sh ${var.nixos_system} ${var.target_user}@${var.target_host} ${var.target_port}"
+    command = "${path.module}/deploy.sh ${var.nixos_system} ${var.target_user} ${var.target_host} ${var.target_port}"
   }
 }