M-Labs
/
nix-scripts
9
0
Fork 9
Code Issues 6 Pull Requests Releases Wiki Activity

wfvm: improve SSH use

This commit is contained in:
Sebastien Bourdeauducq 2020-06-15 13:27:35 +08:00
parent 876f278fdb
commit cc37c8232d
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
artiq-fast/wfvm/demo-ssh.nix
View File

@ -6,6 +6,7 @@ in
wfvm.utils.wfvm-run { wfvm.utils.wfvm-run {
name = "demo-ssh"; name = "demo-ssh";
image = import ./demo-image.nix { inherit pkgs; }; image = import ./demo-image.nix { inherit pkgs; };
display = true; script = ''
script = "${pkgs.openssh}/bin/ssh -p 2022 wfvm@localhost"; ${pkgs.sshpass}/bin/sshpass -p1234 -- ${pkgs.openssh}/bin/ssh -p 2022 wfvm@localhost -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null
'';
} }

2
artiq-fast/wfvm/utils.nix
View File

@ -17,7 +17,7 @@ rec {
] ++ extraFlags; ] ++ extraFlags;
# Pass empty config file to prevent ssh from failing to create ~/.ssh # Pass empty config file to prevent ssh from failing to create ~/.ssh
sshOpts = "-F /dev/null -o StrictHostKeyChecking=accept-new -o UserKnownHostsFile=\$TMP/known_hosts -o ConnectTimeout=1"; sshOpts = "-F /dev/null -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o ConnectTimeout=1";
win-exec = pkgs.writeShellScriptBin "win-exec" '' win-exec = pkgs.writeShellScriptBin "win-exec" ''
${pkgs.sshpass}/bin/sshpass -p1234 -- \ ${pkgs.sshpass}/bin/sshpass -p1234 -- \
${pkgs.openssh}/bin/ssh -np 2022 ${sshOpts} \ ${pkgs.openssh}/bin/ssh -np 2022 ${sshOpts} \