Commit graph

2979 commits

Author SHA1 Message Date
Sander van der Burg
b3c4444c26 The targetHost property defaults to the hostName of the system if not defined
svn path=/nixos/trunk/; revision=25057
2010-12-10 15:39:41 +00:00
Sander van der Burg
e51fcac73c - deployment.targetHost is now defined as an option
- developed services.disnix.infrastructure option, which contains properties for the Disnix infrastructure model (these properties can be either used by Disnix itself or the Avahi publisher)


svn path=/nixos/trunk/; revision=25052
2010-12-10 14:22:00 +00:00
Tobias Hammerschmidt
05c25d3fb2 check for broadcom wireless driver - patch by Vladimír Čunát
svn path=/nixos/trunk/; revision=25045
2010-12-09 19:08:33 +00:00
Eelco Dolstra
ef243b7fc2 * Fix a syntax error in the sleep hook that broke suspend.
svn path=/nixos/trunk/; revision=25038
2010-12-08 19:46:52 +00:00
Sander van der Burg
c318bd097e Fixed the --no-out-link option
svn path=/nixos/trunk/; revision=25034
2010-12-08 14:30:55 +00:00
Sander van der Burg
11d2cd78e0 - deployment.targetHost is now used for connecting to remote hosts instead of deployment.hostname. This makes more sense.
- fixed error in the manual (nixos-deploy-network => nixos-build-vms)


svn path=/nixos/trunk/; revision=25031
2010-12-07 20:13:50 +00:00
Sander van der Burg
9df8293d63 Wrote manual pages for the nixos-deploy-network and nixos-build-vms commands
svn path=/nixos/trunk/; revision=25030
2010-12-07 16:33:18 +00:00
Eelco Dolstra
2e38d8cd31 * ZOMG, fixed a giant bug in the networking of distributed VM tests.
It turns out that all network interfaces in all VMs had the same
  Ethernet address (52:54:00:12:34:56) because we didn't specify any
  with the macaddr=... option.  This can obviously lead to great
  confusion.  For instance, when a router forwards a packet, it can
  actually end up sending the packet to itself because the target
  machine has the same Ethernet address (causing a loop until the TTL
  expires), while the target *also* receives the packet.  It's amazing
  anything worked at all, really.

  So now we just set the Ethernet addresses to 52:54:00:12:<virtual
  network number>:<machine number>.

svn path=/nixos/trunk/; revision=25020
2010-12-07 00:44:29 +00:00
Sander van der Burg
755c30c7a2 - nixos-deploy-network no longer uses an infrastructure model => use nixpkgs.system and deployment.hostname instead
- implemented --no-out-link option so that invoking these tools from scripts leave no garbage behind
- some misc. cleanups


svn path=/nixos/trunk/; revision=25019
2010-12-06 22:02:37 +00:00
Eelco Dolstra
796b48c367 * Run smbd in its own session / process group (setsid) because smbd
now kills its process group when it exits.  Without setsid, this
  ends up killing the parent (i.e., the builder).
* Use port 445 instead of 139 because the CIFS kernel module tries
  port 445 first.  If there is an actual Samba running on the host, it
  would end up connecting to that one instead of our own and fail.

svn path=/nixos/trunk/; revision=25016
2010-12-06 19:02:24 +00:00
Eelco Dolstra
8e168edebc * Increase the number of loopback devices from the default (8),
which is way too small because every VM virtual disk requires
  a loopback device.

svn path=/nixos/trunk/; revision=24988
2010-12-06 09:54:08 +00:00
Lluís Batlle i Rossell
d5fb41795f Adding a wake on lan module.
svn path=/nixos/trunk/; revision=24958
2010-12-02 20:23:45 +00:00
Eelco Dolstra
651a38019d * nixos-deploy-network: build the deploy script locally as an
optimisation and workaround for Nix/210.

svn path=/nixos/trunk/; revision=24956
2010-12-02 18:09:53 +00:00
Eelco Dolstra
e97a3d9cb6 * Fix incorrect path to switch-to-configuration.
svn path=/nixos/trunk/; revision=24955
2010-12-02 17:22:24 +00:00
Eelco Dolstra
29813b418c * Don't run dhclient on Xen's vif* and tap* interfaces.
svn path=/nixos/trunk/; revision=24948
2010-12-01 16:14:44 +00:00
Eelco Dolstra
1b8dd6cf27 * "systemConfig" doesn't exist anymore.
svn path=/nixos/trunk/; revision=24947
2010-12-01 12:36:19 +00:00
Eelco Dolstra
1c451d351f * Make the location of the database configurable.
svn path=/nixos/trunk/; revision=24888
2010-11-26 22:50:57 +00:00
Lluís Batlle i Rossell
25b9c03571 Updating from trunk (specially for the enableFontDir option, as it was not up
to date for nixpkgs)


svn path=/nixos/branches/stdenv-updates/; revision=24871
2010-11-26 14:16:12 +00:00
Lluís Batlle i Rossell
bef46f1553 Moving which to type -P, so 'which ls', 'which time', ... work.
svn path=/nixos/trunk/; revision=24862
2010-11-26 09:57:38 +00:00
Eelco Dolstra
636307c62b * Create /var/lib/nfs/v4recovery.
svn path=/nixos/trunk/; revision=24858
2010-11-25 16:51:07 +00:00
Sander van der Burg
b064f5c80e The Disnix avahi server now also publishes the 'system' attribute and the properties defined in config.deployment
svn path=/nixos/trunk/; revision=24849
2010-11-24 23:00:52 +00:00
Sander van der Burg
31b8ac8120 Implemented 'deployment' option to capture custom attributes related to the system configuration
svn path=/nixos/trunk/; revision=24848
2010-11-24 23:00:21 +00:00
Evgeny Egorochkin
2224d78b33 network-interfaces: MAC address support take 2: now it seems to work
svn path=/nixos/trunk/; revision=24847
2010-11-24 22:58:53 +00:00
Evgeny Egorochkin
72422d4126 network-interfaces: support changing MAC addresses of interfaces
svn path=/nixos/trunk/; revision=24846
2010-11-24 22:58:48 +00:00
Evgeny Egorochkin
50d8698fd8 network-interfaces: cleanup
svn path=/nixos/trunk/; revision=24845
2010-11-24 22:58:42 +00:00
Yury G. Kudryashov
f58efe3336 Add kdm user. Kdm doesn't work here without kdm user
svn path=/nixos/trunk/; revision=24835
2010-11-24 10:45:34 +00:00
Michael Raskin
1b41b6d16d Fix Monit startOn parameter
svn path=/nixos/trunk/; revision=24832
2010-11-24 06:13:37 +00:00
Eelco Dolstra
c958902d44 * Added an option "nixpkgs.system" to specify the system type for
which NixOS should be built.  This is useful in NixOS network
  specifications, because it allows machines in the network to have
  different types, e.g.,

    {
      machine1 =
        { config, pkgs, ... }:
        { nixpkgs.system = "i686-linux";
          ... other config ...
        };

      machine2 =
        { config, pkgs, ... }:
        { nixpkgs.system = "x86_64-linux";
          ... other config ...
        };
    }

  It can also be useful in distributed NixOS tests.

svn path=/nixos/trunk/; revision=24823
2010-11-23 16:07:00 +00:00
Sander van der Burg
fcf53be5bd The DisnixWebService is also published through Avahi
svn path=/nixos/trunk/; revision=24792
2010-11-21 16:04:26 +00:00
Sander van der Burg
ad48c7c534 Initial implementation for the Disnix avahi publisher
svn path=/nixos/trunk/; revision=24789
2010-11-21 13:28:48 +00:00
Michael Raskin
c77c3ab22c Remove ttmkfdir reference
svn path=/nixos/trunk/; revision=24662
2010-11-11 13:24:37 +00:00
Nicolas Pierron
30943d2dc0 Fix nixos-option, accept long arguments.
svn path=/nixos/trunk/; revision=24631
2010-11-09 18:42:59 +00:00
Lluís Batlle i Rossell
f319ca67c5 Trying to improve the message hit by new users, if they use the 2.6.36
kernelPackages and don't disable the ttyBackgrounds. Some users got confused by
the previous message.


svn path=/nixos/trunk/; revision=24612
2010-11-06 18:13:48 +00:00
Rob Vermaas
f34d7250b3 mysql-backup.nix: add option to use single transaction for dumps
svn path=/nixos/trunk/; revision=24594
2010-11-04 08:13:57 +00:00
Eelco Dolstra
cf84a44272 * Use buildEnv with a postBuild hook rather than buildEnvScript.
svn path=/nixos/trunk/; revision=24593
2010-11-03 22:37:39 +00:00
Sander van der Burg
4858ab9da8 The DisnixWebService is now also part of the systemPackages so that a user can invoke the client tool from the command-line
svn path=/nixos/trunk/; revision=24564
2010-11-02 04:20:37 +00:00
Sander van der Burg
e39b10a4d9 - The Disnix service needs Nix in its PATH for now
- Implemented an extraGroups property for tomcat to grant a tomcat application access to the Disnix service


svn path=/nixos/trunk/; revision=24561
2010-11-01 19:01:26 +00:00
Sander van der Burg
9359ebf975 Implemented an option to enable to DisnixWebService on Apache Tomcat
svn path=/nixos/trunk/; revision=24560
2010-11-01 17:33:54 +00:00
Lluís Batlle i Rossell
ccc99b3fc0 Updating from trunk
svn path=/nixos/branches/stdenv-updates/; revision=24555
2010-10-31 19:36:37 +00:00
Lluís Batlle i Rossell
8c27201ce0 Fixing mkOverride and openssh things on system-tarballs
svn path=/nixos/branches/stdenv-updates/; revision=24554
2010-10-31 19:34:39 +00:00
Lluís Batlle i Rossell
edb5870deb Fixing the xterm PS1 for changing the window title, so it is properly bracketed for bash not to count the control sequences as printable characters.
svn path=/nixos/trunk/; revision=24545
2010-10-30 20:40:33 +00:00
Lluís Batlle i Rossell
c4dd77ae9c Make apache start when filesystems are ready.
svn path=/nixos/trunk/; revision=24544
2010-10-30 20:05:38 +00:00
Eelco Dolstra
dff372db3c * Fix evaluation of the luksroot module when luksRoot == null. The
problem is that configuration values below a mkIf are evaluated
  strictly even if the condition is false.  Thus "${luksRoot}" causes
  an evaluation error.  As a workaround, use the empty string instead
  of `null' as the default value.  However, we should really fix the
  laziness of mkIf.  It's likely that NixOS evaluation would be much
  faster if it didn't have to evaluate disabled configuration values.

svn path=/nixos/trunk/; revision=24477
2010-10-25 22:21:51 +00:00
Evgeny Egorochkin
421a80ae8f Make flash work in QtWebkit
svn path=/nixos/trunk/; revision=24474
2010-10-25 16:44:21 +00:00
Eelco Dolstra
f6f40521c3 * Disable the luksroot module for now because it gives an
evaluation error ("cannot coerce null to string").

svn path=/nixos/trunk/; revision=24472
2010-10-25 16:19:32 +00:00
Evgeny Egorochkin
006f7291e4 Make Strigi indexing work in Nepomuk
svn path=/nixos/trunk/; revision=24460
2010-10-25 01:46:30 +00:00
Evgeny Egorochkin
791c758b41 Encrypted root support via LUKS
svn path=/nixos/trunk/; revision=24459
2010-10-25 00:57:30 +00:00
Evgeny Egorochkin
88fb000fc1 Fix UID and GID clash between diferent packages
svn path=/nixos/trunk/; revision=24417
2010-10-22 13:18:26 +00:00
Evgeny Egorochkin
2118288557 KDE4: mp3 playback out of the box
svn path=/nixos/trunk/; revision=24416
2010-10-22 13:18:22 +00:00
Sander van der Burg
9c722e474d - Added nixos-build-vms command, which builds a virtual network from a network.nix expression (also used by nixos-deploy-network)
- Added a backdoor option to the interactive run-vms script. This allows me to intergrate the virtual network approach with Disnix
- Small documentation fixes

Some explanation:

The nixos-build-vms command line tool can be used to build a virtual network of a network.nix specification.
For example, a network configuration (network.nix) could look like this:

{
  test1 = 
    {pkgs, config, ...}:
 
    {
      services.openssh.enable = true;
      ...
    };

  test2 =
    {pkgs, config, ...}:
    
    {
      services.openssh.enable = true;
      services.xserver.enable = true;
    }

    ;
}

By typing the following instruction:

$ nixos-build-vms -n network.nix

a virtual network is built, which can be started by typing:

$ ./result/bin/run-vms

It is also possible to enable a backdoor. In this case *.socket files are stored in the current directory
which can be used by the end-user to invoke remote instruction on a VM in the network through a Unix
domain socket.

For example by building the network with the following instructions:

$ nixos-build-vms -n network.nix --use-backdoor

and launching the virtual network:

$ ./result/bin/run-vms

You can find two socket files in your current directory, namely: test1.socket and test2.socket.
These Unix domain sockets can be used to remotely administer the test1 and test2 machine
in the virtual network.

For example by running:

$ socat ./test1.socket stdio
ls /root

You can retrieve the contents of the /root directory of the virtual machine with identifier test1


svn path=/nixos/trunk/; revision=24410
2010-10-21 22:50:12 +00:00