svn path=/configurations/trunk/tud/; revision=27003
svn path=/configurations/trunk/tud/; revision=27003
Eelco Dolstra committed
Apr 27, 2011 at 15:11 UTC
b526cf70ae20e3453065a1f48638f6ce303ea301
2 files changed
+41
-6
cartman.nix
+33
-6
@@ -205,7 +205,7 @@ rec {
205
documentRoot = cleanSource ./webroot;
206
enableUserDir = true;
207
extraSubservices = [
208
- { serviceType = "subversion";
208
+ { function = import /etc/nixos/services/subversion;
209
urlPrefix = "";
210
toplevelRedirect = false;
211
dataDir = "/data/subversion";
@@ -217,7 +217,7 @@ rec {
217
logo = "/serg-logo.png";
218
};
219
}
220
- { serviceType = "subversion";
220
+ { function = import /etc/nixos/services/subversion;
221
id = "ptg";
222
urlPrefix = "/ptg";
223
dataDir = "/data/subversion-ptg";
@@ -250,7 +250,7 @@ rec {
250
251
{ hostName = "strategoxt.org";
252
extraSubservices = [
253
- { serviceType = "twiki";
253
+ { function = import /etc/nixos/services/twiki;
254
startWeb = "Stratego/WebHome";
255
dataDir = "/data/pt-wiki/data";
256
pubDir = "/data/pt-wiki/pub";
@@ -272,7 +272,7 @@ rec {
272
{ hostName = "svn.strategoxt.org";
273
enableSSL = true;
274
extraSubservices = [
275
- { serviceType = "subversion";
275
+ { function = import /etc/nixos/services/subversion;
276
id = "strategoxt";
277
urlPrefix = "";
278
dataDir = "/data/subversion-strategoxt";
@@ -290,7 +290,7 @@ rec {
290
{ hostName = "program-transformation.org";
291
serverAliases = ["www.program-transformation.org"];
292
extraSubservices = [
293
- { serviceType = "twiki";
293
+ { function = import /etc/nixos/services/twiki;
294
startWeb = "Transform/WebHome";
295
dataDir = "/data/pt-wiki/data";
296
pubDir = "/data/pt-wiki/pub";
@@ -343,6 +343,19 @@ rec {
343
];
344
}
345
346
+ { hostName = "syntax-definition.org";
347
+ serverAliases = ["www.syntax-definition.org"];
348
+ extraSubservices = [
349
+ { function = import /etc/nixos/services/twiki;
350
+ startWeb = "Sdf/WebHome";
351
+ dataDir = "/data/pt-wiki/data";
352
+ pubDir = "/data/pt-wiki/pub";
353
+ twikiName = "Syntax Definition Wiki";
354
+ registrationDomain = "ewi.tudelft.nl";
355
+ }
356
+ ];
357
+ }
358
+
359
{ hostName = "www.nixos.org";
360
globalRedirect = "http://nixos.org/";
361
}
@@ -350,7 +363,7 @@ rec {
363
{ hostName = "svn.nixos.org";
364
enableSSL = true;
365
extraSubservices = [
353
- { serviceType = "subversion";
366
+ { function = import /etc/nixos/services/subversion;
367
id = "nix";
368
urlPrefix = "";
369
dataDir = "/data/subversion-nix";
@@ -433,6 +446,20 @@ rec {
446
ProxyPassReverse / http://lucifer:8080/
447
'';
448
}
449
+
450
+ { hostName = "cloud.nixos.org";
451
+ extraConfig = ''
452
+ <Proxy *>
453
+ Order deny,allow
454
+ Allow from all
455
+ </Proxy>
456
+
457
+ ProxyRequests Off
458
+ ProxyPreserveHost On
459
+ ProxyPass / http://stan:8773/ retry=5
460
+ ProxyPassReverse / http://stan:8773/
461
+ '';
462
+ }
463
];
464
};
465
machines.nix
+8
@@ -183,6 +183,14 @@ lib: with lib;
183
ethernetAddress = "00:16:3e:00:00:05";
184
systems = [ "i686-linux" ];
185
}
186
+
187
+ { # Another NixOS test machine.
188
+ hostName = "clyde";
189
+ ipAddress = "192.168.1.55";
190
+ ethernetAddress = "00:16:3e:00:00:06";
191
+ systems = [ "x86_64-linux" ];
192
+ }
193
+
194
]
195
196
# Machines for the agilecloud experiment.