Author: eelco
Date: Fri Nov 26 22:50:23 2010
New Revision: 24887
URL: https://svn.nixos.org/websvn/nix/?rev=24887&sc=1
Log:
Modified:
configurations/trunk/tud/cartman.nix
Modified: configurations/trunk/tud/cartman.nix
==============================================================================
--- configurations/trunk/tud/cartman.nix Fri Nov 26 22:50:08 2010
(r24886)
+++ configurations/trunk/tud/cartman.nix Fri Nov 26 22:50:23 2010
(r24887)
@@ -37,12 +37,17 @@
kernelModules = ["kvm-intel"];
};
- fileSystems = [
- { mountPoint = "/";
- label = "nixos";
- options = "acl";
- }
- ];
+ fileSystems =
+ [ { mountPoint = "/";
+ label = "nixos";
+ options = "acl";
+ }
+ { mountPoint = "/data/releases";
+ device = "192.168.1.25:/data/releases";
+ fsType = "nfs";
+ options = "vers=3"; # !!! check why vers=4 doesn't work
+ }
+ ];
swapDevices = [
{ label = "swap1"; }
@@ -296,20 +301,11 @@
{ urlPath = "/update";
dir = "/data/webserver/update";
}
+ { urlPath = "/releases";
+ dir = "/data/releases";
+ }
];
- extraConfig = ''
- <Proxy *>
- Order deny,allow
- Allow from all
- </Proxy>
-
- ProxyRequests Off
- ProxyPreserveHost On
- ProxyPass /releases/ http://lucifer:80/releases/
- ProxyPassReverse /releases/ http://lucifer:80/releases/
- '';
-
servedFiles = [
{ urlPath = "/releases/css/releases.css";
file = releasesCSS;
@@ -357,6 +353,20 @@
'';
}
+ { hostName = "hydra-test.nixos.org";
+ extraConfig = ''
+ <Proxy *>
+ Order deny,allow
+ Allow from all
+ </Proxy>
+
+ ProxyRequests Off
+ ProxyPreserveHost On
+ ProxyPass / http://hydra:3001/ retry=5
+ ProxyPassReverse / http://hydra:3001/
+ '';
+ }
+
{ hostName = "wiki.nixos.org";
extraConfig = ''
RedirectMatch ^/$ /wiki
@@ -378,6 +388,19 @@
documentRoot = "/home/karltk/public_html/planet";
}
+ { hostName = "sonar.nixos.org";
+ extraConfig = ''
+ <Proxy *>
+ Order deny,allow
+ Allow from all
+ </Proxy>
+
+ ProxyRequests Off
+ ProxyPreserveHost On
+ ProxyPass / http://lucifer:8080/ retry=5
+ ProxyPassReverse / http://lucifer:8080/
+ '';
+ }
];
};
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
