kloenk/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

dsa -> ed25519

Browse source 
DSS is disabled by default in NixOS 18.03.

https://hydra.nixos.org/build/68788560
This commit is contained in:
Eelco Dolstra 2018-02-08 13:46:23 +01:00
parent f201b7733e
commit 444bae44ef
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
tests/nix-copy-closure.nix
View file

@ -29,10 +29,10 @@ makeTest (let pkgA = pkgs.cowsay; pkgB = pkgs.wget; pkgC = pkgs.hello; in {
startAll; startAll;
# Create an SSH key on the client. # Create an SSH key on the client.
my $key = `${pkgs.openssh}/bin/ssh-keygen -t dsa -f key -N ""`; my $key = `${pkgs.openssh}/bin/ssh-keygen -t ed25519 -f key -N ""`;
$client->succeed("mkdir -m 700 /root/.ssh"); $client->succeed("mkdir -m 700 /root/.ssh");
$client->copyFileFromHost("key", "/root/.ssh/id_dsa"); $client->copyFileFromHost("key", "/root/.ssh/id_ed25519");
$client->succeed("chmod 600 /root/.ssh/id_dsa"); $client->succeed("chmod 600 /root/.ssh/id_ed25519");
# Install the SSH key on the server. # Install the SSH key on the server.
$server->succeed("mkdir -m 700 /root/.ssh"); $server->succeed("mkdir -m 700 /root/.ssh");

10
tests/remote-builds.nix
View file

@ -46,13 +46,13 @@ in
nix.buildMachines = nix.buildMachines =
[ { hostName = "slave1"; [ { hostName = "slave1";
sshUser = "root"; sshUser = "root";
sshKey = "/root/.ssh/id_dsa"; sshKey = "/root/.ssh/id_ed25519";
system = "i686-linux"; system = "i686-linux";
maxJobs = 1; maxJobs = 1;
} }
{ hostName = "slave2"; { hostName = "slave2";
sshUser = "root"; sshUser = "root";
sshKey = "/root/.ssh/id_dsa"; sshKey = "/root/.ssh/id_ed25519";
system = "i686-linux"; system = "i686-linux";
maxJobs = 1; maxJobs = 1;
} }
@ -70,10 +70,10 @@ in
startAll; startAll;
# Create an SSH key on the client. # Create an SSH key on the client.
my $key = `${pkgs.openssh}/bin/ssh-keygen -t dsa -f key -N ""`; my $key = `${pkgs.openssh}/bin/ssh-keygen -t ed25519 -f key -N ""`;
$client->succeed("mkdir -p -m 700 /root/.ssh"); $client->succeed("mkdir -p -m 700 /root/.ssh");
$client->copyFileFromHost("key", "/root/.ssh/id_dsa"); $client->copyFileFromHost("key", "/root/.ssh/id_ed25519");
$client->succeed("chmod 600 /root/.ssh/id_dsa"); $client->succeed("chmod 600 /root/.ssh/id_ed25519");
# Install the SSH key on the slaves. # Install the SSH key on the slaves.
$client->waitForUnit("network.target"); $client->waitForUnit("network.target");