Author: eelco
Date: Tue Jun 21 09:51:12 2011
New Revision: 27509
URL: https://svn.nixos.org/websvn/nix/?rev=27509&sc=1
Log:
Modified:
configurations/trunk/tud/cartman.nix
configurations/trunk/tud/machines.nix
configurations/trunk/tud/network.nix
Modified: configurations/trunk/tud/cartman.nix
==============================================================================
--- configurations/trunk/tud/cartman.nix Tue Jun 21 07:28:30 2011
(r27508)
+++ configurations/trunk/tud/cartman.nix Tue Jun 21 09:51:12 2011
(r27509)
@@ -117,6 +117,9 @@
# Create a local network (prefix:1::/64).
ip -6 addr add 2001:610:685:1::1/64 dev eth0
+
+ # Forward traffic to our Nova cloud to "stan".
+ ip -6 route add 2001:610:685:2::/64 via
2001:610:685:1:222:19ff:fe55:bf2e
'';
};
@@ -470,6 +473,21 @@
ProxyPassReverse / http://stan:8773/
'';
}
+
+ { hostName = "vnc.nixos.org";
+ extraConfig = ''
+ <Proxy *>
+ Order deny,allow
+ Allow from all
+ </Proxy>
+
+ ProxyRequests Off
+ ProxyPreserveHost On
+ ProxyPass / http://stan:6080/ retry=5
+ ProxyPassReverse / http://stan:6080/
+ '';
+ }
+
];
};
Modified: configurations/trunk/tud/machines.nix
==============================================================================
--- configurations/trunk/tud/machines.nix Tue Jun 21 07:28:30 2011
(r27508)
+++ configurations/trunk/tud/machines.nix Tue Jun 21 09:51:12 2011
(r27509)
@@ -190,6 +190,25 @@
ethernetAddress = "00:16:3e:00:00:06";
systems = [ "x86_64-linux" ];
}
+
+ { # 48 core powerrrr
+ hostName = "wendy";
+ ipAddress = "192.168.1.26";
+ ethernetAddress = "f0:4d:a2:40:1b:be";
+ systems = [ "x86_64-linux" ];
+ }
+ { # 48 core powerrrr
+ hostName = "ike";
+ ipAddress = "192.168.1.27";
+ ethernetAddress = "f0:4d:a2:40:1b:91";
+ systems = [ "x86_64-linux" ];
+ }
+ { # 48 core powerrrr
+ hostName = "shelley";
+ ipAddress = "192.168.1.28";
+ ethernetAddress = "f0:4d:a2:40:10:6c";
+ systems = [ "x86_64-linux" ];
+ }
]
Modified: configurations/trunk/tud/network.nix
==============================================================================
--- configurations/trunk/tud/network.nix Tue Jun 21 07:28:30 2011
(r27508)
+++ configurations/trunk/tud/network.nix Tue Jun 21 09:51:12 2011
(r27509)
@@ -2,11 +2,11 @@
jimmy = import ./build-machines-hps.nix;
timmy = import ./build-machines-hps.nix;
kenny = import ./build-machines-dell-1950.nix;
- #stan = import ./build-machines-dell-1950.nix;
kyle = import ./build-machines-dell-1950.nix;
+ stan = import ./stan.nix;
cartman = import ./cartman.nix;
hydra = import ./hydra.nix;
lucifer = import ./lucifer.nix;
- mrkitty = import ./mrkitty.nix;
- mrhankey = import ./mrhankey.nix;
+ #mrkitty = import ./mrkitty.nix;
+ #mrhankey = import ./mrhankey.nix;
}
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
