Author: eelco
Date: Wed Apr 27 15:11:05 2011
New Revision: 27003
URL: https://svn.nixos.org/websvn/nix/?rev=27003&sc=1
Log:
Modified:
configurations/trunk/tud/cartman.nix
configurations/trunk/tud/machines.nix
Modified: configurations/trunk/tud/cartman.nix
==============================================================================
--- configurations/trunk/tud/cartman.nix Wed Apr 27 15:00:43 2011
(r27002)
+++ configurations/trunk/tud/cartman.nix Wed Apr 27 15:11:05 2011
(r27003)
@@ -205,7 +205,7 @@
documentRoot = cleanSource ./webroot;
enableUserDir = true;
extraSubservices = [
- { serviceType = "subversion";
+ { function = import /etc/nixos/services/subversion;
urlPrefix = "";
toplevelRedirect = false;
dataDir = "/data/subversion";
@@ -217,7 +217,7 @@
logo = "/serg-logo.png";
};
}
- { serviceType = "subversion";
+ { function = import /etc/nixos/services/subversion;
id = "ptg";
urlPrefix = "/ptg";
dataDir = "/data/subversion-ptg";
@@ -250,7 +250,7 @@
{ hostName = "strategoxt.org";
extraSubservices = [
- { serviceType = "twiki";
+ { function = import /etc/nixos/services/twiki;
startWeb = "Stratego/WebHome";
dataDir = "/data/pt-wiki/data";
pubDir = "/data/pt-wiki/pub";
@@ -272,7 +272,7 @@
{ hostName = "svn.strategoxt.org";
enableSSL = true;
extraSubservices = [
- { serviceType = "subversion";
+ { function = import /etc/nixos/services/subversion;
id = "strategoxt";
urlPrefix = "";
dataDir = "/data/subversion-strategoxt";
@@ -290,7 +290,7 @@
{ hostName = "program-transformation.org";
serverAliases = ["www.program-transformation.org"];
extraSubservices = [
- { serviceType = "twiki";
+ { function = import /etc/nixos/services/twiki;
startWeb = "Transform/WebHome";
dataDir = "/data/pt-wiki/data";
pubDir = "/data/pt-wiki/pub";
@@ -343,6 +343,19 @@
];
}
+ { hostName = "syntax-definition.org";
+ serverAliases = ["www.syntax-definition.org"];
+ extraSubservices = [
+ { function = import /etc/nixos/services/twiki;
+ startWeb = "Sdf/WebHome";
+ dataDir = "/data/pt-wiki/data";
+ pubDir = "/data/pt-wiki/pub";
+ twikiName = "Syntax Definition Wiki";
+ registrationDomain = "ewi.tudelft.nl";
+ }
+ ];
+ }
+
{ hostName = "www.nixos.org";
globalRedirect = "http://nixos.org/";;
}
@@ -350,7 +363,7 @@
{ hostName = "svn.nixos.org";
enableSSL = true;
extraSubservices = [
- { serviceType = "subversion";
+ { function = import /etc/nixos/services/subversion;
id = "nix";
urlPrefix = "";
dataDir = "/data/subversion-nix";
@@ -433,6 +446,20 @@
ProxyPassReverse / http://lucifer:8080/
'';
}
+
+ { hostName = "cloud.nixos.org";
+ extraConfig = ''
+ <Proxy *>
+ Order deny,allow
+ Allow from all
+ </Proxy>
+
+ ProxyRequests Off
+ ProxyPreserveHost On
+ ProxyPass / http://stan:8773/ retry=5
+ ProxyPassReverse / http://stan:8773/
+ '';
+ }
];
};
Modified: configurations/trunk/tud/machines.nix
==============================================================================
--- configurations/trunk/tud/machines.nix Wed Apr 27 15:00:43 2011
(r27002)
+++ configurations/trunk/tud/machines.nix Wed Apr 27 15:11:05 2011
(r27003)
@@ -183,6 +183,14 @@
ethernetAddress = "00:16:3e:00:00:05";
systems = [ "i686-linux" ];
}
+
+ { # Another NixOS test machine.
+ hostName = "clyde";
+ ipAddress = "192.168.1.55";
+ ethernetAddress = "00:16:3e:00:00:06";
+ systems = [ "x86_64-linux" ];
+ }
+
]
# Machines for the agilecloud experiment.
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
