nix-community/nixos-anywhere
1
1
Fork 0
mirror of https://github.com/nix-community/nixos-anywhere.git synced 2024-08-16 20:00:36 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge #128

Browse Source 
128: terraform: do not show private key in local-exec logs r=zimbatm a=jfroche



Co-authored-by: Jean-François Roche <jfroche@pyxel.be>
This commit is contained in:
bors[bot] 2023-06-07 08:58:06 +00:00 committed by GitHub
commit dad3cdebda
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
terraform/install/main.tf
View File

@ -11,5 +11,6 @@ resource "null_resource" "nixos-remote" {
SSH_PRIVATE_KEY = var.ssh_private_key
}
command = "nix run --extra-experimental-features 'nix-command flakes' path:${path.module}/../..#nixos-anywhere -- ${local.nixos_anywhere_flags}"
quiet = var.debug_logging
}
}

2
terraform/nixos-rebuild/deploy.sh
View File

@ -23,6 +23,7 @@ sshOpts=(-p "${TARGET_PORT}")
sshOpts+=(-o UserKnownHostsFile=/dev/null)
sshOpts+=(-o StrictHostKeyChecking=no)
set +x
if [[ -n ${SSH_KEY+x} && ${SSH_KEY} != "-" ]]; then
sshPrivateKeyFile="$workDir/ssh_key"
# Create the file with 0700 - umask calculation: 777 - 700 = 077
@ -33,6 +34,7 @@ if [[ -n ${SSH_KEY+x} && ${SSH_KEY} != "-" ]]; then
unset SSH_AUTH_SOCK # don't use system agent if key was supplied
sshOpts+=(-o "IdentityFile=${sshPrivateKeyFile}")
fi
set -x
try=1
until NIX_SSHOPTS="${sshOpts[*]}" nix copy -s --experimental-features nix-command --to "ssh://$TARGET" "$NIXOS_SYSTEM"; do