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