svn path=/nixos/trunk/; revision=19242
This commit is contained in:
parent
bc238be01a
commit
0f5b178fcf
@ -32,8 +32,7 @@
|
|||||||
{config, pkgs, ...}:
|
{config, pkgs, ...}:
|
||||||
{
|
{
|
||||||
fileSystems = pkgs.lib.mkOverride 50 {}
|
fileSystems = pkgs.lib.mkOverride 50 {}
|
||||||
[
|
[ { mountPoint = "/repos";
|
||||||
{ mountPoint = "/repos";
|
|
||||||
device = "storage:/repos"; }
|
device = "storage:/repos"; }
|
||||||
];
|
];
|
||||||
|
|
||||||
@ -47,26 +46,8 @@
|
|||||||
client =
|
client =
|
||||||
{config, pkgs, ...}:
|
{config, pkgs, ...}:
|
||||||
{
|
{
|
||||||
services.xserver.enable = true;
|
require = [ ./common/x11.nix ];
|
||||||
services.xserver.displayManager.slim.enable = false;
|
|
||||||
services.xserver.displayManager.kdm.enable = true;
|
|
||||||
services.xserver.displayManager.kdm.extraConfig =
|
|
||||||
''
|
|
||||||
[X-:0-Core]
|
|
||||||
AutoLoginEnable=true
|
|
||||||
AutoLoginUser=alice
|
|
||||||
AutoLoginPass=foobar
|
|
||||||
'';
|
|
||||||
services.xserver.desktopManager.default = "kde4";
|
|
||||||
services.xserver.desktopManager.kde4.enable = true;
|
services.xserver.desktopManager.kde4.enable = true;
|
||||||
users.extraUsers = pkgs.lib.singleton {
|
|
||||||
name = "alice";
|
|
||||||
description = "Alice Foobar";
|
|
||||||
home = "/home/alice";
|
|
||||||
createHome = true;
|
|
||||||
useDefaultShell = true;
|
|
||||||
password = "foobar";
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -85,10 +66,10 @@
|
|||||||
$webserver->mustSucceed("PYTHONPATH=${pkgs.pythonPackages.psycopg2}/lib/python2.5/site-packages trac-admin /var/trac/projects/test initenv Test postgres://root\@postgresql/trac svn /repos/trac");
|
$webserver->mustSucceed("PYTHONPATH=${pkgs.pythonPackages.psycopg2}/lib/python2.5/site-packages trac-admin /var/trac/projects/test initenv Test postgres://root\@postgresql/trac svn /repos/trac");
|
||||||
|
|
||||||
$client->waitForFile("/tmp/.X11-unix/X0");
|
$client->waitForFile("/tmp/.X11-unix/X0");
|
||||||
sleep 60;
|
sleep 20;
|
||||||
|
|
||||||
$client->execute("su - alice -c 'DISPLAY=:0.0 konqueror http://webserver/projects/test &'");
|
$client->execute("su - root -c 'DISPLAY=:0.0 konqueror http://webserver/projects/test &'");
|
||||||
sleep 120;
|
sleep 90;
|
||||||
|
|
||||||
$client->screenshot("screen");
|
$client->screenshot("screen");
|
||||||
'';
|
'';
|
||||||
|
Loading…
x
Reference in New Issue
Block a user