From 894435ce5e783badca4e63d36860337b16bedeb4 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 27 May 2010 10:05:17 +0000 Subject: [PATCH] * Slight cleanup. svn path=/nixos/trunk/; revision=21998 --- tests/openssh.nix | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/tests/openssh.nix b/tests/openssh.nix index c6875bcc73c..ca96e6ccfc9 100644 --- a/tests/openssh.nix +++ b/tests/openssh.nix @@ -2,31 +2,29 @@ { nodes = { + server = {pkgs, config, ...}: { services.openssh.enable = true; - } - ; + }; + client = {pkgs, config, ...}: { - } - ; + }; }; testScript = '' my $key=`${pkgs.openssh}/bin/ssh-keygen -t dsa -f key -N ""`; - $server->mustSucceed("mkdir /root/.ssh"); - $server->mustSucceed("chmod 700 /root/.ssh"); + $server->mustSucceed("mkdir -m 700 /root/.ssh"); $server->copyFileFromHost("key.pub", "/root/.ssh/authorized_keys"); - $client->mustSucceed("mkdir /root/.ssh"); - $client->mustSucceed("chmod 700 /root/.ssh"); + $client->mustSucceed("mkdir -m 700 /root/.ssh"); $client->copyFileFromHost("key", "/root/.ssh/id_dsa"); $client->mustSucceed("chmod 600 /root/.ssh/id_dsa");