svn path=/configurations/trunk/tud/; revision=16607
svn path=/configurations/trunk/tud/; revision=16607
Eelco Dolstra committed
Aug 7, 2009 at 12:48 UTC
2cd9be602f11f3635a5c569ec3afec5b2100c1ec
1 file changed
+30
-6
cartman.nix
+30
-6
@@ -1,6 +1,6 @@
1
-let
1
+{config, pkgs, ...}:
2
3
- pkgs = import /etc/nixos/nixpkgs {};
3
+let
4
5
machines = import ./machines.nix;
6
@@ -35,7 +35,8 @@ rec {
35
extraKernelModules = ["arcmsr"];
36
};
37
kernelModules = ["kvm-intel"];
38
- kernelPackages = pkgs: pkgs.kernelPackages_2_6_27;
38
+ kernelPackages = pkgs.kernelPackages_2_6_27;
39
+ copyKernels = true;
40
};
41
42
fileSystems = [
@@ -106,6 +107,9 @@ rec {
107
iptables -t nat -A POSTROUTING -s 192.168.1.0/24 -d 192.168.1.0/24 -j ACCEPT
108
iptables -t nat -A POSTROUTING -s 192.168.1.0/24 -j SNAT --to-source ${myIP}
109
110
+ # losser ssh
111
+ iptables -t nat -A PREROUTING -p tcp -i eth1 --dport 8080 -j DNAT --to 192.168.1.18:2022
112
+
113
echo 1 > /proc/sys/net/ipv4/ip_forward
114
'';
115
@@ -159,17 +163,19 @@ rec {
163
164
extraJobs = [
165
166
+ /*
167
{ name = "buildfarm";
168
extraPath = [supervisor];
169
job = ''
170
description "Build farm job runner"
171
167
- start on network-interfaces/started
172
+ #start on network-interfaces/started
173
stop on network-interfaces/stop
174
170
- respawn ${pkgs.su}/bin/su - buildfarm -c 'sendNotifications=1 ${supervisor}/bin/buildfarm-supervisor' > /var/log/buildfarm 2>&1
175
+ respawn ${pkgs.su}/bin/su - buildfarm -c 'sendNotifications=0 ${supervisor}/bin/buildfarm-supervisor' > /var/log/buildfarm 2>&1
176
'';
177
}
178
+ */
179
180
{ name = "jira";
181
users = [
@@ -200,18 +206,19 @@ rec {
206
207
postgresql = {
208
enable = true;
209
+ enableTCPIP = true;
210
dataDir = "/data/postgresql";
211
authentication = ''
212
local all all ident sameuser
213
host all all 127.0.0.1/32 md5
214
host all all ::1/128 md5
215
host all all 192.168.1.18/32 md5
216
+ host all all 130.161.159.80/32 md5
217
'';
218
};
219
220
httpd = {
221
enable = true;
214
- experimental = true;
222
logPerVirtualHost = true;
223
adminAddr = "e.dolstra@tudelft.nl";
224
hostName = "localhost";
@@ -271,9 +278,11 @@ rec {
278
logo = "/serg-logo.png";
279
};
280
}
281
+ /*
282
{ serviceType = "zabbix";
283
urlPrefix = "/zabbix";
284
}
285
+ */
286
];
287
servedDirs = [
288
{ urlPath = "/releases";
@@ -294,6 +303,10 @@ rec {
303
extraSubservices = [
304
{ serviceType = "twiki";
305
startWeb = "Stratego/WebHome";
306
+ dataDir = "/data/pt-wiki/data";
307
+ pubDir = "/data/pt-wiki/pub";
308
+ twikiName = "Stratego/XT Wiki";
309
+ registrationDomain = "ewi.tudelft.nl";
310
}
311
];
312
}
@@ -330,6 +343,10 @@ rec {
343
extraSubservices = [
344
{ serviceType = "twiki";
345
startWeb = "Transform/WebHome";
346
+ dataDir = "/data/pt-wiki/data";
347
+ pubDir = "/data/pt-wiki/pub";
348
+ twikiName = "Program Transformation Wiki";
349
+ registrationDomain = "ewi.tudelft.nl";
350
}
351
];
352
}
@@ -414,9 +431,15 @@ rec {
431
documentRoot = "/home/karltk/public_html/planet";
432
}
433
434
+ { hostName = "buildfarm.info";
435
+ serverAliases = ["www.buildfarm.info"];
436
+ documentRoot = "/data/webserver/buildfarm.info";
437
+ }
438
+
439
];
440
};
441
442
+ /*
443
zabbixAgent = {
444
enable = true;
445
};
@@ -424,6 +447,7 @@ rec {
447
zabbixServer = {
448
enable = true;
449
};
450
+ */
451
452
};
453