Author: sandervanderburg Date: 2010-06-10 15:21:08 +0000 (Thu, 10 Jun 2010) New Revision: 22213
You can view the changes in this commit at: https://svn.nixos.org/viewvc/nix?rev=22213&view=rev Added: disnix/examples/disnix-proxy-example/trunk/deployment/DistributedDeployment/network.nix disnix/examples/disnix-proxy-example/trunk/deployment/configurations/ disnix/examples/disnix-proxy-example/trunk/deployment/configurations/test-vm.nix Modified: disnix/examples/disnix-proxy-example/trunk/deployment/DistributedDeployment/distribution-with-proxy.nix disnix/examples/disnix-proxy-example/trunk/deployment/DistributedDeployment/distribution-without-proxy.nix disnix/examples/disnix-proxy-example/trunk/deployment/DistributedDeployment/infrastructure.nix Log: Added network model Changes: Modified: disnix/examples/disnix-proxy-example/trunk/deployment/DistributedDeployment/distribution-with-proxy.nix =================================================================== --- disnix/examples/disnix-proxy-example/trunk/deployment/DistributedDeployment/distribution-with-proxy.nix 2010-06-10 13:24:31 UTC (rev 22212) +++ disnix/examples/disnix-proxy-example/trunk/deployment/DistributedDeployment/distribution-with-proxy.nix 2010-06-10 15:21:08 UTC (rev 22213) @@ -1,7 +1,7 @@ {infrastructure}: { - hello_world_server = [ infrastructure.test ]; - hello_world_client = [ infrastructure.test ]; - disnix_tcp_proxy = [ infrastructure.test ]; + hello_world_server = [ infrastructure.test1 ]; + hello_world_client = [ infrastructure.test2 ]; + disnix_tcp_proxy = [ infrastructure.test1 ]; } Modified: disnix/examples/disnix-proxy-example/trunk/deployment/DistributedDeployment/distribution-without-proxy.nix =================================================================== --- disnix/examples/disnix-proxy-example/trunk/deployment/DistributedDeployment/distribution-without-proxy.nix 2010-06-10 13:24:31 UTC (rev 22212) +++ disnix/examples/disnix-proxy-example/trunk/deployment/DistributedDeployment/distribution-without-proxy.nix 2010-06-10 15:21:08 UTC (rev 22213) @@ -1,6 +1,6 @@ {infrastructure}: { - hello_world_server = [ infrastructure.test ]; - hello_world_client = [ infrastructure.test ]; + hello_world_server = [ infrastructure.test1 ]; + hello_world_client = [ infrastructure.test2 ]; } Modified: disnix/examples/disnix-proxy-example/trunk/deployment/DistributedDeployment/infrastructure.nix =================================================================== --- disnix/examples/disnix-proxy-example/trunk/deployment/DistributedDeployment/infrastructure.nix 2010-06-10 13:24:31 UTC (rev 22212) +++ disnix/examples/disnix-proxy-example/trunk/deployment/DistributedDeployment/infrastructure.nix 2010-06-10 15:21:08 UTC (rev 22213) @@ -1,5 +1,9 @@ { - test = { + test1 = { hostname = "127.0.0.1"; }; + + test2 = { + hostname = "127.0.0.1"; + }; } Added: disnix/examples/disnix-proxy-example/trunk/deployment/DistributedDeployment/network.nix =================================================================== --- disnix/examples/disnix-proxy-example/trunk/deployment/DistributedDeployment/network.nix (rev 0) +++ disnix/examples/disnix-proxy-example/trunk/deployment/DistributedDeployment/network.nix 2010-06-10 15:21:08 UTC (rev 22213) @@ -0,0 +1,4 @@ +{ + test1 = import ../configurations/test-vm.nix; + test2 = import ../configurations/test-vm.nix; +} Added: disnix/examples/disnix-proxy-example/trunk/deployment/configurations/test-vm.nix =================================================================== --- disnix/examples/disnix-proxy-example/trunk/deployment/configurations/test-vm.nix (rev 0) +++ disnix/examples/disnix-proxy-example/trunk/deployment/configurations/test-vm.nix 2010-06-10 15:21:08 UTC (rev 22213) @@ -0,0 +1,38 @@ +{pkgs, ...}: + +{ + boot = { + loader = { + grub = { + device = "/dev/sda"; + }; + }; + }; + + fileSystems = [ + { mountPoint = "/"; + device = "/dev/sda2"; + } + ]; + + swapDevices = [ + { device = "/dev/sda1"; } + ]; + + services = { + openssh = { + enable = true; + }; + + disnix = { + enable = true; + }; + }; + + environment = { + systemPackages = [ + pkgs.mc + pkgs.subversion + ]; + }; +} _______________________________________________ nix-commits mailing list [email protected] http://mail.cs.uu.nl/mailman/listinfo/nix-commits
