Commit graph

615 commits

Author SHA1 Message Date
Eelco Dolstra
97f30fb17b * The Zabbix agent should start after the hostname is set.
svn path=/nixos/trunk/; revision=20029
2010-02-15 20:34:01 +00:00
Eelco Dolstra
cc90f62ceb * Use `psql' with an empty command to check whether PostgreSQL is up
and running.  `pg_ctl status' merely checks whether PostgreSQL is
  running, not whether it is already accepting connections.  This
  causes Upstart jobs that depend on PostgreSQL to fail.

svn path=/nixos/trunk/; revision=20024
2010-02-15 19:29:54 +00:00
Eelco Dolstra
83b76bc2cf * Option `services.apache.phpIni' (which is of type derivation)
replaced by `services.apache.phpOptions' (of type string).
* Allow Apache subservices to add to phpOptions.
* Set the TZ environment variable in Apache.
* Updated the Zabbix web interface.

svn path=/nixos/trunk/; revision=20023
2010-02-15 19:02:42 +00:00
Eelco Dolstra
014ffaac5d * Update the Zabbix agent module.
svn path=/nixos/trunk/; revision=20019
2010-02-15 17:13:43 +00:00
Eelco Dolstra
4253490fd4 svn path=/nixos/trunk/; revision=20016 2010-02-15 15:55:54 +00:00
Ludovic Courtès
5cb934da59 Fix Bash completion support.
svn path=/nixos/trunk/; revision=19971
2010-02-13 00:07:12 +00:00
Eelco Dolstra
dbc03fbf68 * nixos-install: copy /etc/nsswitch.conf to the chroot. This seems
necessary to have it use /etc/hosts.

svn path=/nixos/trunk/; revision=19905
2010-02-10 14:31:46 +00:00
Ludovic Courtès
b7b1f5d1cc X11: Add a few more basic X clients to `systemPackages'.
svn path=/nixos/trunk/; revision=19902
2010-02-10 13:22:38 +00:00
Eelco Dolstra
07cc5ac2fd * "python2.5" -> ${pkgs.python.libPrefix}
svn path=/nixos/trunk/; revision=19901
2010-02-10 12:39:47 +00:00
Eelco Dolstra
0f56bd755a * Disable bash completion for now. It gives login errors:
bash: BASH_COMPLETION_DIR: readonly variable
    bash: BASH_COMPLETION: readonly variable

  And in the non-interactive shell, we get:

    /nix/store/654xcqk8h2a409mxsnsbnj5c0cp9mjhm-bash-4.1-p2/etc/bash_completion: line 75: shopt: progcomp: invalid shell option name

svn path=/nixos/trunk/; revision=19809
2010-02-04 09:15:46 +00:00
Eelco Dolstra
6a06118f85 * Use the build flags given on the command line while building Nix.
svn path=/nixos/trunk/; revision=19799
2010-02-03 22:49:50 +00:00
Eelco Dolstra
051e9342b3 * Use the moduli file. This shuts up the "WARNING: /etc/ssh/moduli
does not exist, using fixed modulus" message in /var/log/messages.

svn path=/nixos/trunk/; revision=19754
2010-02-01 17:05:02 +00:00
Marco Maggesi
86b42fdfbf Fix bugs and improve modules/services/network-filesystems/openafs-client
svn path=/nixos/trunk/; revision=19751
2010-02-01 16:29:15 +00:00
Eelco Dolstra
fc583b7054 * When QEMU encounters a "disk full" condition on the host filesystem,
its default behaviour is to stop the emulator (i.e. suspend the VM).
  For automated tests, this is bad, because is makes the VM appear to
  hang without any error message.  The "werror=report" flag causes
  QEMU to report the problem to the VM.  As a side effect QEMU exits
  very elegantly:

    [    2.308668] end_request: I/O error, dev vda, sector 534400
    [    2.309611] Buffer I/O error on device vda, logical block 66800
    ...
    *** glibc detected *** /nix/store/yhngqrww53j0aw7z7v4bv948x5g5fc3d-qemu-kvm-0.12.1.2/bin/qemu-system-x86_64: double free or corruption (!prev): 0x08e3e040 ***
    Aborted

  So I guess we now depend on a bug in QEMU :-)

svn path=/nixos/trunk/; revision=19703
2010-01-27 10:36:43 +00:00
Eelco Dolstra
0432766399 * Fall back to the kernel modules used at boot time if the modules in
the current configuration don't match the running kernel.  This
  ensures that modprobe still works after a "nixos-rebuild switch" to
  a configuration that has a different kernel version.

svn path=/nixos/trunk/; revision=19696
2010-01-26 21:45:13 +00:00
Eelco Dolstra
442093d27d * grep returns a non-zero exit code if no line matches, causing the
swap task to fail.  So ignore that.

svn path=/nixos/trunk/; revision=19660
2010-01-26 09:56:53 +00:00
Eelco Dolstra
32995b3d36 * Make the AMI disk a bit bigger. Thanks to sparse images and
compression this shouldn't be expensive.

svn path=/nixos/trunk/; revision=19647
2010-01-25 10:40:08 +00:00
Marc Weber
aad3d21ceb upstart: quote environment vars. John Altobelli hit the case TZ=New York
svn path=/nixos/trunk/; revision=19633
2010-01-23 22:38:30 +00:00
Ludovic Courtès
06aeb7d87f GNUnet: Add options; add as a system package; provide /etc/gnunetd.conf.
svn path=/nixos/trunk/; revision=19630
2010-01-23 15:47:33 +00:00
Eelco Dolstra
cb728f833f svn path=/nixos/trunk/; revision=19624 2010-01-22 21:07:06 +00:00
Eelco Dolstra
50430f19e1 * Only run dhclient on interfaces of type 1, otherwise it fails to
start if the machine has weird network devices (e.g. "eql").

svn path=/nixos/trunk/; revision=19623
2010-01-22 20:34:32 +00:00
Eelco Dolstra
9094ecb546 * Some hacks to get the image to work with newer EC2 kernels/initrds.
svn path=/nixos/trunk/; revision=19622
2010-01-22 20:22:40 +00:00
Eelco Dolstra
12a0a68749 * Initialise the Nix database in the VM.
* Set the hostname at startup.
* Mount the ephemeral data disk (/dev/sda2).


svn path=/nixos/trunk/; revision=19619
2010-01-22 17:31:23 +00:00
Eelco Dolstra
3e3448a7df * Added an Upstart job to fetch the SSH key for logging into the root
account of the VM.  However, it doesn't work yet (the machine
  doesn't boot properly and there is no console output).  So use a
  hard-coded password for now (very dangerous!).

svn path=/nixos/trunk/; revision=19589
2010-01-21 08:03:58 +00:00
Eelco Dolstra
590acc193c * A module for generating a disk image suitable for use with Amazon's
Elastic Compute Cloud (EC2).  TODO: run ec2-bundle-image here.

svn path=/nixos/trunk/; revision=19580
2010-01-20 18:10:02 +00:00
Eelco Dolstra
6d21e00776 * Some hacks to support running NixOS on Amazon EC2 (and other hosting
environment where you don't get to run stage 1 of the boot).

svn path=/nixos/trunk/; revision=19579
2010-01-20 18:06:33 +00:00
Eelco Dolstra
8a6346e477 * Provide a bundle of CA certificates in /etc/ca-bundle.crt, and set
the CURL_CA_BUNDLE environment variable.  This allows curl to work
  without the `-k' flag on https sites with a properly signed
  certificate.

svn path=/nixos/trunk/; revision=19572
2010-01-20 14:22:47 +00:00
Michael Raskin
6502806689 Allow turning off VESA framebuffer
svn path=/nixos/trunk/; revision=19473
2010-01-15 21:55:51 +00:00
Lluís Batlle i Rossell
8d5037ad62 network-interfaces and emitting ip-up: I was still learning boolean logic.
svn path=/nixos/trunk/; revision=19464
2010-01-15 11:20:57 +00:00
Lluís Batlle i Rossell
13ee735395 Making nixos work well with the new names 'linuxPackages' in stdenv-updates, additionally
to the nixpkgs trunk 'kernelPackages'.
Seeing a strange kernelPackages mentioned in installation-cd-rescue (2.6.31_something) I
update that to 2.6.32.


svn path=/nixos/trunk/; revision=19443
2010-01-14 19:50:49 +00:00
Eelco Dolstra
f89e46bc12 * Revert r19339 because it doesn't work and gives a lot of errors:
client# /dev/fd/9: line 13: -q: command not found
client# /dev/fd/9: line 18: test: -neq: binary operator expected
client# mdadm: No arrays found in config file

svn path=/nixos/trunk/; revision=19386
2010-01-13 10:37:58 +00:00
Lluís Batlle i Rossell
b5ade01199 Make network-interfaces emit the ip-up if there are interfaces defined *OR*
there are localCommands (which potentially can bring up interfaces).


svn path=/nixos/trunk/; revision=19371
2010-01-12 11:08:27 +00:00
Ludovic Courtès
c68f5fbae4 Add support for pam_limits.
svn path=/nixos/trunk/; revision=19370
2010-01-12 11:02:23 +00:00
Lluís Batlle i Rossell
d45a3fbdc9 Adding the pcscd daemon (this daemon manages smartcard reader drivers), and offers
a common interface to programs dealing with smartcards (like users of the opensc lib).


svn path=/nixos/trunk/; revision=19360
2010-01-11 21:56:01 +00:00
Eelco Dolstra
ee005424bf * Doh, subtle race condition: STARTUP must be cleared after "udevadm
settle".  Otherwise some rules may be processed with STARTUP
  cleared, causing LVM devices not to be created.

svn path=/nixos/trunk/; revision=19341
2010-01-10 20:08:35 +00:00
Eelco Dolstra
eccddb67fa * --mknodes is no longer needed (in fact it might interfere with
udev).

svn path=/nixos/trunk/; revision=19340
2010-01-10 20:07:23 +00:00
Nicolas Pierron
b02cf8d20e Check that 'mdadm --assemble' is effective before continuing.
svn path=/nixos/trunk/; revision=19339
2010-01-10 19:36:53 +00:00
Eelco Dolstra
cac502e35b * Okay, so we do need an "lvm" task to run vgscan/vgchange. It's only
needed though for devices that were not already found and activated
  in the initrd.

svn path=/nixos/trunk/; revision=19337
2010-01-10 19:14:42 +00:00
Eelco Dolstra
ac8a2ae577 * Use the LVM udev rules in stage 1. This makes
/dev/disk/by-{label,uuid} paths available for LVM volumes.

svn path=/nixos/trunk/; revision=19334
2010-01-10 19:00:29 +00:00
Eelco Dolstra
5c66611f3e svn path=/nixos/trunk/; revision=19333 2010-01-10 18:34:32 +00:00
Eelco Dolstra
cf06d2b9cf * Don't start the filesystems task on a startup event. It's pointless
to do so until udev has created device nodes.

svn path=/nixos/trunk/; revision=19332
2010-01-10 18:23:13 +00:00
Eelco Dolstra
e50a7e5f32 * Removed the boot.initrd.lvm option for simplicity.
svn path=/nixos/trunk/; revision=19330
2010-01-10 16:32:30 +00:00
Eelco Dolstra
1a0bb65901 * Added a regression test for whether the Nixpkgs channel works. This
is done by instantiating a webserver that simulates nixos.org.
  Using nix-push we create a channel that contains some stuff (namely
  the GNU Hello source tarball and the rlwrap program).  This was a
  bit tricky because nix-push requires a writable Nix store.  Using
  AUFS this is possible, but not on recent Linux kernels (AUFS1 over
  CIFS fails).

svn path=/nixos/trunk/; revision=19327
2010-01-10 01:26:01 +00:00
Eelco Dolstra
79add5ecbc * Make the Nix store in the guest writable.
svn path=/nixos/trunk/; revision=19326
2010-01-10 01:20:30 +00:00
Eelco Dolstra
39796e26b4 * Removed the boot.isLiveCD option. Moved the code for mounting a
tmpfs on top of the CD to iso-image.nix.

svn path=/nixos/trunk/; revision=19318
2010-01-09 15:13:06 +00:00
Lluís Batlle i Rossell
b59cfde311 Making /dev/pts files have group owner 'tty', so 'mesg y' will work.
svn path=/nixos/trunk/; revision=19317
2010-01-09 14:23:20 +00:00
Eelco Dolstra
6f8a3ba7c7 * Create devicemapper/lvm device nodes from udev (using the rules
supplied by the lvm package).  This makes the "lvm" Upstart task
  unnecessary.  Also, we now get /dev/disk/by-{label,uuid} symlinks
  for LVM logical disks.

svn path=/nixos/trunk/; revision=19300
2010-01-07 22:39:35 +00:00
Lluís Batlle i Rossell
fa2a6f835f Adding wicd, taking in the patch sent by roconnor to nix-dev on 2010-01-07.
svn path=/nixos/trunk/; revision=19298
2010-01-07 17:53:03 +00:00
Eelco Dolstra
0595b7f89d * devicemapper -> lvm2.
svn path=/nixos/trunk/; revision=19294
2010-01-07 16:14:50 +00:00
Eelco Dolstra
9a0789a81e * Add devicemapper to the system path.
svn path=/nixos/trunk/; revision=19292
2010-01-07 15:55:05 +00:00