Shortened the Trac test expression a bit to make it more readable

svn path=/nixos/trunk/; revision=16965
This commit is contained in:
Sander van der Burg 2009-09-04 23:04:29 +00:00
parent 4c2650d015
commit d6b1b4615a

View File

@ -11,34 +11,21 @@ rec {
storage = storage =
{pkgs, config, ...}: {pkgs, config, ...}:
{ {
services = { services.portmap.enable = true;
portmap = { services.nfsKernel.enable = true;
enable = true; services.nfsKernel.exports = ''
};
nfsKernel = {
enable = true;
exports = ''
/repos 192.168.1.0/255.255.255.0(rw,no_root_squash) /repos 192.168.1.0/255.255.255.0(rw,no_root_squash)
''; '';
createMountPoints = true; services.nfsKernel.createMountPoints = true;
};
};
}; };
postgresql = postgresql =
{config, pkgs, ...}: {config, pkgs, ...}:
{ {
services = { services.sshd.enable = true;
sshd = { services.postgresql.enable = true;
enable = true; services.postgresql.enableTCPIP = true;
}; services.postgresql.authentication = ''
postgresql = {
enable = true;
enableTCPIP = true;
authentication = ''
# Generated file; do not edit! # Generated file; do not edit!
local all all trust local all all trust
host all all 127.0.0.1/32 trust host all all 127.0.0.1/32 trust
@ -46,8 +33,6 @@ rec {
host all all 192.168.1.0/24 trust host all all 192.168.1.0/24 trust
''; '';
}; };
};
};
webserver = webserver =
{config, pkgs, ...}: {config, pkgs, ...}:
@ -58,62 +43,30 @@ rec {
device = "storage:/repos"; } device = "storage:/repos"; }
]; ];
services = { services.portmap.enable = true;
portmap = { services.nfsKernel.enable = true;
enable = true; services.httpd.enable = true;
}; services.httpd.adminAddr = "root@localhost";
services.httpd.extraSubservices = [ { serviceType = "trac"; } ];
nfsKernel = { environment.systemPackages = [ pkgs.pythonPackages.trac pkgs.subversion ];
enable = true;
};
httpd = {
enable = true;
adminAddr = "root@localhost";
extraSubservices = [
{ serviceType = "trac"; }
];
};
};
environment = {
extraPackages = [ pkgs.pythonPackages.trac pkgs.subversion ];
};
}; };
client = client =
{config, pkgs, ...}: {config, pkgs, ...}:
{ {
services = { services.xserver.enable = true;
xserver = { services.xserver.displayManager.slim.enable = false;
enable = true; services.xserver.displayManager.kdm.enable = true;
services.xserver.displayManager.kdm.extraConfig =
displayManager = {
slim = {
enable = false;
};
kdm = {
enable = true;
extraConfig =
'' ''
[X-:0-Core] [X-:0-Core]
AutoLoginEnable=true AutoLoginEnable=true
AutoLoginUser=alice AutoLoginUser=alice
AutoLoginPass=foobar AutoLoginPass=foobar
''; '';
}; services.xserver.desktopManager.default = "kde4";
}; services.xserver.desktopManager.kde4.enable = true;
desktopManager = { users.extraUsers = pkgs.lib.singleton {
default = "kde4";
kde4 = {
enable = true;
};
};
};
};
users = {
extraUsers = pkgs.lib.singleton {
name = "alice"; name = "alice";
description = "Alice Foobar"; description = "Alice Foobar";
home = "/home/alice"; home = "/home/alice";
@ -121,13 +74,7 @@ rec {
useDefaultShell = true; useDefaultShell = true;
password = "foobar"; password = "foobar";
}; };
}; environment.systemPackages = [ pkgs.scrot ];
environment = {
extraPackages = [
pkgs.scrot
];
};
}; };
}; };