Commit Graph

1239 Commits

Author SHA1 Message Date
Evgeny Egorochkin
88a400f578 Fix LVM failing test due to /proc/devices not being available in some of OpenVZ containers
svn path=/nixos/trunk/; revision=22717
2010-07-22 22:45:24 +00:00
Eelco Dolstra
d659488209 * Use the regular GRUB menu builder for Amazon. There are two issues:
we want to generate the GRUB menu without actually installing GRUB
  (because Amazon supplies its own pv-grub), and each menu entry
  requires "root (hd0)".  For the first, allow boot.loader.grub.device
  to be set to "nodev" to indicate that the GRUB menu should be
  generated without installing GRUB.  For the second, add an option
  boot.loader.grub.extraPerEntryConfig to allow commands to be added
  to each GRUB menu entry (in this case, "root (hd0)").

svn path=/nixos/trunk/; revision=22712
2010-07-22 14:40:29 +00:00
Eelco Dolstra
e7c0c929ed * Work around a bug in QEMU, which doesn't implement the "READ DISC
INFORMATION" SCSI command:

    https://bugzilla.redhat.com/show_bug.cgi?id=609049

  As a result, `cdrom_id' doesn't print
  ID_CDROM_MEDIA_TRACK_COUNT_DATA, which in turn prevents the
  /dev/disk/by-label symlinks from being created.  We need these in
  the NixOS installation CD, so use ID_CDROM_MEDIA in the
  corresponding udev rules for now.  This was the behaviour in udev <=
  154.  See also
       
    http://www.spinics.net/lists/hotplug/msg03935.html

svn path=/nixos/trunk/; revision=22691
2010-07-21 21:15:54 +00:00
Eelco Dolstra
d7f638da0c * Amazon now supports booting a custom kernel in the AMI using
pv-grub, so supply a GRUB menu that starts our own kernel and
  initrd.

svn path=/nixos/trunk/; revision=22678
2010-07-20 13:53:14 +00:00
Eelco Dolstra
1b04d3a813 * Absolutise $systemConfig in case it's a symlink.
svn path=/nixos/trunk/; revision=22677
2010-07-20 13:50:10 +00:00
Eelco Dolstra
63962dd7d6 * Disable the test to see whether $stage2Init exists. For some
unfathomable reason this test fails on EC2 if it's a symlink
  (despite the -L test).  I give up.

svn path=/nixos/trunk/; revision=22676
2010-07-20 13:49:04 +00:00
Eelco Dolstra
1a5c18d1b6 svn path=/nixos/trunk/; revision=22647 2010-07-18 22:29:40 +00:00
Eelco Dolstra
b14f80c89a * The modprobe wrapper nowadays checks whether the version of the
current kernel module tree matches the booted kernel, so it should
  be safe to use after an upgrade.

svn path=/nixos/trunk/; revision=22627
2010-07-18 20:19:27 +00:00
Eelco Dolstra
b835f7f0dd * Fix PostgreSQL boot.
svn path=/nixos/trunk/; revision=22615
2010-07-15 21:21:16 +00:00
Eelco Dolstra
f3e1607758 * Don't run the emergency-shell task after nixos-rebuild because it
screws up the X server (CPU usage goes to 100%, switching virtual
  consoles no longer works, etc.).  TODO: we need some generic way to
  mark jobs that shouldn't be started automatically.

svn path=/nixos/trunk/; revision=22608
2010-07-15 12:31:18 +00:00
Eelco Dolstra
b614179eed * Install a configuration.nix in the AMI.
svn path=/nixos/trunk/; revision=22607
2010-07-15 11:09:30 +00:00
Eelco Dolstra
f1dde44ac1 * Added an action `nixos-rebuild pull' to just pull the Nixpkgs
channel manifest and exit.  Useful if you don't want to use
  nix-channel.

svn path=/nixos/trunk/; revision=22601
2010-07-14 14:18:27 +00:00
Eelco Dolstra
f0b647c326 * Allow the Apache submodules to declare whether they need PHP.
Don't depend on PHP unless this is the case.

svn path=/nixos/trunk/; revision=22600
2010-07-14 12:58:38 +00:00
Eelco Dolstra
bfe46a653b * Mount /dev, /proc and /sys when booting without a stage 1 (e.g. on
Amazon).

svn path=/nixos/trunk/; revision=22598
2010-07-14 10:55:45 +00:00
Eelco Dolstra
fb97b5b122 * MediaWiki 1.15.4.
svn path=/nixos/trunk/; revision=22589
2010-07-13 21:11:35 +00:00
Eelco Dolstra
4b018d1294 svn path=/nixos/trunk/; revision=22587 2010-07-13 20:47:31 +00:00
Wouter den Breejen
e058f7ea45 sabnzbd now really starts at boot
svn path=/nixos/trunk/; revision=22579
2010-07-13 14:45:44 +00:00
Eelco Dolstra
baf54c517d * Fix the terminal_output command. (This used to work but not with
the latest GRUB I guess.)

svn path=/nixos/trunk/; revision=22575
2010-07-13 11:48:40 +00:00
Eelco Dolstra
2b7ac80b3d * Style changes.
svn path=/nixos/trunk/; revision=22573
2010-07-13 09:23:35 +00:00
Eelco Dolstra
44656be396 * dbus-daemon: use /etc/dbus-1/system.conf (i.e. ‘--system’) rather than
${configDir}/system.conf.  This is necessary to enable dbus to
  reload its configuration on SIGHUP after a nixos-rebuild.  (The
  daemon cannot be restarted because then console-kit-daemon loses its
  state.)
* Generate a proper /etc/dbus-1/session.conf.

svn path=/nixos/trunk/; revision=22572
2010-07-13 09:22:52 +00:00
Eelco Dolstra
86d53a5b8b * Load the cpufreq modules, since these are not loaded automatically
by udev.  The kernel can load governors on demand, but if they are
  not loaded, HAL doesn't know about them and they don't show up in
  the KDE System Settings.

svn path=/nixos/trunk/; revision=22567
2010-07-12 17:50:02 +00:00
Eelco Dolstra
dc0db647a9 * Remove a debug line that should not have been committed.
svn path=/nixos/trunk/; revision=22566
2010-07-12 16:40:02 +00:00
Eelco Dolstra
158c3daec1 * Don't do the "poweroff -f" fallback because that prevents
interactive testing ("nix-build tests/ -A nfs.vms;
  ./result/bin/run-vms").

svn path=/nixos/trunk/; revision=22565
2010-07-12 16:09:02 +00:00
Eelco Dolstra
14ddf8e096 * On an `ip-up' event, notify mountall so that it retries mounting
remote filesystems.

svn path=/nixos/trunk/; revision=22564
2010-07-12 16:07:26 +00:00
Eelco Dolstra
c50948309d * Add a missing dependency.
svn path=/nixos/trunk/; revision=22563
2010-07-12 15:32:23 +00:00
Eelco Dolstra
9600035e02 * Don't use "starting" events because they basically don't work - they
cause restarting of jobs to hang indefinitely because the required
  "start on" condition never triggers.

  For instance, after "stop nfs-kernel-nfsd", "start nfs-kernel-nfsd"
  will hang until we do "stop portmap; start portmap".  This is due to
  the "starting nfs-kernel-nfsd and started portmap" condition in
  the nfs-kernel-mountd job.  Apparently, because portmap is already
  running, the condition "started portmap" never happens because no
  event is emitted.

svn path=/nixos/trunk/; revision=22562
2010-07-12 15:14:26 +00:00
Eelco Dolstra
ae539b7790 * Oops.
svn path=/nixos/trunk/; revision=22561
2010-07-12 13:42:59 +00:00
Eelco Dolstra
aa3230979b * Set the priorities right.
svn path=/nixos/trunk/; revision=22560
2010-07-12 13:41:22 +00:00
Eelco Dolstra
b51e309c89 * `sm-notify' should also run on the server
(http://hydra.nixos.org/build/483567).  I love regression tests.

svn path=/nixos/trunk/; revision=22559
2010-07-12 13:03:27 +00:00
Evgeny Egorochkin
a86b1bd43d Improved the TOR service to be able to act as a TOR relay and disable the client functionality. Doesn't change the behavior of the existing TOR configurations.
svn path=/nixos/trunk/; revision=22554
2010-07-12 06:03:52 +00:00
Eelco Dolstra
abbc2f4f2b * Make acpid depend on syslogd (to prevent it printing startup
messages to the console).

svn path=/nixos/trunk/; revision=22545
2010-07-09 12:35:06 +00:00
Eelco Dolstra
54a4eead20 * Typos.
svn path=/nixos/trunk/; revision=22537
2010-07-08 16:21:55 +00:00
Eelco Dolstra
5c0f6619cf * Idem.
svn path=/nixos/trunk/; revision=22535
2010-07-08 15:54:10 +00:00
Eelco Dolstra
7123115d6f * Call update-mime-database.
svn path=/nixos/trunk/; revision=22528
2010-07-08 12:55:18 +00:00
Eelco Dolstra
b076121430 * Don't use the -v flag because not every fsck backend knows it.
svn path=/nixos/trunk/; revision=22512
2010-07-07 14:25:16 +00:00
Eelco Dolstra
6856c60ba3 * There is no "samba-control" job.
svn path=/nixos/trunk/; revision=22509
2010-07-07 12:32:56 +00:00
Eelco Dolstra
9ac60a3aa3 * Merge the ‘nfs-kernel-sm-notify’ task into the post-start script of
the ‘nfs-kernel-statd’ task.
* Work around an apparent bug in Upstart: the ‘mountall’ task cannot
  be restarted because of the ‘starting mountall’ condition in the
  statd task.  So instead make ‘mountall’ depend on ‘started
  nfs-kernel-statd’.

svn path=/nixos/trunk/; revision=22508
2010-07-07 12:11:29 +00:00
Eelco Dolstra
d0342b4cf5 * The network-interfaces' task should wait until udevtrigger' has
finished, because it loads the kernel modules for the network
  devices.

svn path=/nixos/trunk/; revision=22492
2010-07-06 11:03:23 +00:00
Eelco Dolstra
bb2d97770e * Move the swap module to config/ because it doesn't provide a task
anymore.  Activating swap devices is now handled by the mountall
  task.

svn path=/nixos/branches/boot-order/; revision=22489
2010-07-06 09:01:15 +00:00
Eelco Dolstra
54d201294b * Sync with the trunk.
svn path=/nixos/branches/boot-order/; revision=22487
2010-07-06 08:21:05 +00:00
Eelco Dolstra
da0d5c5645 * Use config.system.build.grub rather than pkgs.grub to get the right
GRUB when version 2 is enabled.

svn path=/nixos/branches/boot-order/; revision=22479
2010-07-05 14:33:11 +00:00
Eelco Dolstra
4225181fa1 * Ensure that the ‘mount-failed’ and ‘emergency-shell’ tasks don't get
started by ‘switch-to-configuration.sh’.

svn path=/nixos/branches/boot-order/; revision=22473
2010-07-05 09:28:22 +00:00
Wouter den Breejen
2335cb65a3 Added sabnzbd :)
SABnzbd makes Usenet as simple and streamlined as possible by automating everything we can. All you have to do is add an .nzb. SABnzbd takes over from there, where it will be automatically downloaded, verified, repaired, extracted and filed away with zero human interaction.

http://sabnzbd.org/

svn path=/nixos/trunk/; revision=22446
2010-07-03 15:10:48 +00:00
Lluís Batlle i Rossell
41cc6ecdbb Trying to make the nixos-bootstrap-archive (nixos-minimal-archive in other places named) to have an
hydra build product for easy tarball download.


svn path=/nixos/trunk/; revision=22440
2010-07-01 17:54:03 +00:00
Evgeny Egorochkin
ebd9fb6cf3 Added Quassel IRC client service
svn path=/nixos/trunk/; revision=22425
2010-06-28 18:36:37 +00:00
Marc Weber
0dd9b4caaf reverting -r22286
svn path=/nixos/trunk/; revision=22358
2010-06-21 14:17:19 +00:00
Eelco Dolstra
d43d321e86 * Sync with the trunk.
svn path=/nixos/branches/boot-order/; revision=22349
2010-06-20 20:54:31 +00:00
Eelco Dolstra
061ea1674f * Increase the CIFS timeout here as well.
svn path=/nixos/branches/boot-order/; revision=22348
2010-06-20 20:52:42 +00:00
Eelco Dolstra
593a110c47 * Make sure that kernel log messages appear in the VM output. The
comment was incorrect - when klogd is running, kernel messages no
  longer appear on the serial port.

svn path=/nixos/branches/boot-order/; revision=22346
2010-06-20 19:22:23 +00:00
Eelco Dolstra
20a88efffa * Fix networking in the installer test.
* If connecting to the host fails in the guest, then shutdown
  immediately.

svn path=/nixos/branches/boot-order/; revision=22341
2010-06-20 15:33:44 +00:00
Eelco Dolstra
363806e89b * To establish the connection to the root shell in the guest, let the
guest connect to a Unix domain socket on the host rather than the
  other way around.  The former is a QEMU feature (guestfwd to a
  socket) while the latter requires a patch (which we can now get rid
  of).

svn path=/nixos/branches/boot-order/; revision=22331
2010-06-18 19:31:02 +00:00
Eelco Dolstra
200a8b9a56 * Change the priority to make the NAT and Bittorrent tests work.
svn path=/nixos/branches/boot-order/; revision=22329
2010-06-18 18:53:13 +00:00
Eelco Dolstra
ac22e5369f * Prevent tests from accessing the host's network accidentally. For
instance, `nixos-rebuild' in the installer test does a `nix-pull'
  from nixos.org.

svn path=/nixos/branches/boot-order/; revision=22325
2010-06-18 13:21:01 +00:00
Eelco Dolstra
a65b5ec81c * Added an option boot.loader.grub.extraConfig to add commands to
grub.cfg before the menu entries.  (This could also be done using
  `extraEntriesBeforeNixOS', but then you can't have entries *after*
  the main entry anymore.)
* In the installer test, redirect GRUB output to the serial port.

svn path=/nixos/branches/boot-order/; revision=22300
2010-06-16 22:18:26 +00:00
Eelco Dolstra
69c7175404 * During shutdown, don't unmount mount points that don't exist (in the
current namespace).  This prevents warnings about the aufs/tmpfs
  mounts from the initrd used by the installation CD.

svn path=/nixos/branches/boot-order/; revision=22299
2010-06-16 22:16:43 +00:00
Lluís Batlle i Rossell
f69d7b1768 Fixing my previous bad commit on stat. Thank you David!
svn path=/nixos/trunk/; revision=22297
2010-06-16 15:17:02 +00:00
Lluís Batlle i Rossell
fbb3046a87 Making the grub menu builder take a better path at distinguishing if / and /boot are different fs.
I chose %D over %d because I like hex more.


svn path=/nixos/trunk/; revision=22294
2010-06-16 13:58:15 +00:00
Marc Weber
d0fd8da8f0 example how to pass options to nix-daemon
svn path=/nixos/trunk/; revision=22286
2010-06-15 19:04:06 +00:00
Eelco Dolstra
46ac1375a7 * Don't use -smb and -no-kvm-irqchip. Maybe this makes VM builds more
reliable.

svn path=/nixos/branches/boot-order/; revision=22280
2010-06-15 16:15:17 +00:00
Eelco Dolstra
e2dbfbdcf4 * Use writeback caching for virtual disks instead of writethrough
caching.  This makes a huge performance difference (e.g. from 4 MB/s
  `dd' throughput to 140 MB/s on the Hydra machines).  As the QEMU
  manual says: "Some block drivers perform badly with
  ‘cache=writethrough’, most notably, qcow2."

svn path=/nixos/branches/boot-order/; revision=22248
2010-06-13 23:36:55 +00:00
Eelco Dolstra
03f77ca82b * PostgreSQL / MySQL: depend on the "filesystem" event.
svn path=/nixos/branches/boot-order/; revision=22247
2010-06-13 20:59:49 +00:00
Lluís Batlle i Rossell
b1b73f3c08 Noting the booted-system as a gcroot
svn path=/nixos/trunk/; revision=22228
2010-06-12 08:44:51 +00:00
Lluís Batlle i Rossell
b25771532a Fixing the postfix start/stop (through an upstart job script code that will
monitor the life of postfix)

Adding an assert to upstart jobs, so those with preStop will always need an exec or
script, otherwise the preStop will not be run.


svn path=/nixos/trunk/; revision=22225
2010-06-11 21:44:06 +00:00
Eelco Dolstra
a5c433696c * Put all of /var/run (not just /var/run/nscd) on a tmpfs to simplify
shutdown.  (Portmap and statd are needed during shutdown to unmount
  NFS volumes but have open files in /var/run.)
* In the shutdown job, don't kill PIDs belonging to Upstart jobs that
  are still running.  If they don't stop on the "starting shutdown"
  event, then they're needed during shutdown (such as portmap and
  statd).
* NFS test: test whether the shutdown quickly unmounts NFS volumes
  (i.e. whether portmap and statd are still running).

svn path=/nixos/branches/boot-order/; revision=22204
2010-06-09 22:29:06 +00:00
Eelco Dolstra
94088e9b48 * Daemonise mountd/statd.
svn path=/nixos/branches/boot-order/; revision=22198
2010-06-09 13:45:51 +00:00
Eelco Dolstra
645ed8d3b4 * Start NFS daemons in the right order as described in the nfs-utils
README (i.e. for the server: exportfs, mountd, statd, nfsd,
  sm-notify; for the client: statd / sm-notify before mountall).  This
  is important to allow locking to work correctly.

svn path=/nixos/branches/boot-order/; revision=22196
2010-06-09 13:18:01 +00:00
Eelco Dolstra
156ba2def2 * Don't use the "kvm-clock" clock source because it's unreliable.
When starting multiple VMs, some will have perfectly synchronised
  clocks, while others will have their clocks run much slower (say, a
  factor of 5).

svn path=/nixos/branches/boot-order/; revision=22195
2010-06-09 13:15:15 +00:00
Eelco Dolstra
d837ae4914 * portmap: don't use the -f flag to ensure that when the job reaches
the "started" state, portmap is actually up.

svn path=/nixos/branches/boot-order/; revision=22192
2010-06-09 11:15:25 +00:00
Eelco Dolstra
c1ecdf708f * Put the hostname of the VM in the window title.
svn path=/nixos/branches/boot-order/; revision=22191
2010-06-09 10:51:05 +00:00
Eelco Dolstra
5ddaf9b963 * Set `services.nfsKernel.client.enable' automatically if there is a
filesystem with type "nfs" or "nfs4".

svn path=/nixos/branches/boot-order/; revision=22189
2010-06-08 16:14:41 +00:00
Eelco Dolstra
a9e8bf6491 * nfsd: run rpc.nfsd from the pre-start script since it's not actually
a daemon (it just starts some kernel threads).  In the post-stop
  script, stop the kernel threads.
* exportfs: fix the createMountPoints option.
* Mount the nfsd filesystem on /proc/fs/nfsd because mountd prefers
  this.

svn path=/nixos/branches/boot-order/; revision=22187
2010-06-08 16:01:31 +00:00
Eelco Dolstra
3eac003800 * Maintain /var/log/wtmp correctly during boot/shutdown.
svn path=/nixos/branches/boot-order/; revision=22182
2010-06-08 12:48:16 +00:00
Eelco Dolstra
7c3ae9e716 * During shutdown, warn explicitly about filesystems that could not be
unmounted or remounted read-only.
* Don't try to unmount / or /nix/store.

svn path=/nixos/branches/boot-order/; revision=22181
2010-06-08 11:52:16 +00:00
Eelco Dolstra
23cc979f61 * Run `swapoff -a' during shutdown. Otherwise filesystems containing
swapfiles cannot be unmounted or even remounted read-only.
* In the remount, pass `-t none' to get a more informative error
  message if the filesystem is in use.

svn path=/nixos/branches/boot-order/; revision=22179
2010-06-08 10:06:00 +00:00
Lluís Batlle i Rossell
dadd6d63e7 oops. Fixing the cupsd path. How to set a single path there in the job? I don't know.
svn path=/nixos/trunk/; revision=22174
2010-06-07 21:44:06 +00:00
Lluís Batlle i Rossell
9e275ffa58 Trying to improve the cups expression a bit, so it can print also with local usb printers.
(Thank you Oleksandr)


svn path=/nixos/trunk/; revision=22173
2010-06-07 21:09:27 +00:00
Eelco Dolstra
48fdc931a4 * Run udevtrigger in a separate job. This speeds up booting because
it allows the `mountall' task to start mounting filesystems as soon
  as udev is running and devices become available (i.e. it doesn't
  have to wait for all devices).  This means that some jobs should
  depend on "stopped udevtrigger" instead of "started udev".

svn path=/nixos/branches/boot-order/; revision=22167
2010-06-07 12:39:50 +00:00
Eelco Dolstra
085a47c88a * Bind mounts should have filesystem type "none" to prevent an
invocation of "fsck.auto" at boot time.

svn path=/nixos/branches/boot-order/; revision=22166
2010-06-07 12:16:59 +00:00
Eelco Dolstra
6290788247 * If mountall fails to mount all filesystems, start an emergency shell
to allow the user to fix or ignore the problem.

svn path=/nixos/branches/boot-order/; revision=22165
2010-06-07 12:15:55 +00:00
Eelco Dolstra
5702557a65 * Put e2fsprogs etc. in mountall's $PATH so that fsck works.
svn path=/nixos/branches/boot-order/; revision=22151
2010-06-04 15:35:32 +00:00
Eelco Dolstra
dbadf6e9c2 * Use mountall to mount all filesystems and activate all swap devices
during boot.  Mountall ensures that these are done in the right
  order.  It's informed by udev about devices becoming available.  It
  emits some Upstart events upon reaching certain states, in
  particular ‘local-filesystems’ after all local filesystems have been
  mounted successfully, ‘remote-filesystems’ after all network
  filesystems have been mounted, and ‘filesystem’ (sic) when all
  filesystems have been mounted.

  Currently, if a filesystem fails to mount or doesn't exist, then the
  mingettys won't start and the boot will appear to hang.  This is
  because mountall doesn't emit an event for failing filesystems and
  waits indefinitely for the filesystems to become available.

* The ‘filesystems’ and ‘swap’ Upstart jobs are gone.  (Support for
  encrypted swap devices is temporarily gone.)
  
* Generate a proper /etc/fstab from the ‘fileSystems’ and
  ‘swapDevices’ options.

svn path=/nixos/branches/boot-order/; revision=22148
2010-06-04 14:22:11 +00:00
Eelco Dolstra
5316059442 * Revert an unintended commit.
svn path=/nixos/trunk/; revision=22145
2010-06-04 14:00:56 +00:00
Eelco Dolstra
7f41d2bb86 svn path=/nixos/trunk/; revision=22126 2010-06-03 14:32:23 +00:00
Eelco Dolstra
6676bbe61d svn path=/nixos/trunk/; revision=22111 2010-06-02 23:02:09 +00:00
Eelco Dolstra
0cdce12006 * Rename the pwdutils' module to shadow'.
svn path=/nixos/trunk/; revision=22109
2010-06-02 21:16:27 +00:00
Eelco Dolstra
c089738bdc * Use the shadow' package instead of pwdutils', `pam_login' and
`su'.
* The `usermod' from `shadow' allows setting a supplementary group
  equal to the user's primary group, so the special hack for the
  `nixbld' group is no longer needed.
* Removed /etc/default/passwd since it's not used by the new passwd.
  The hash is configured in pam_unix.
* Move some values for `security.setuidPrograms' and
  `security.pam.services' to the appropriate modules.

svn path=/nixos/trunk/; revision=22107
2010-06-02 21:10:48 +00:00
Eelco Dolstra
876954d15d * Use pam_unix (from the PAM package) instead of pam_unix2. All the
functionality we needed from pam_unix2 (more secure hashes, and,
  uh...) has been merged into pam_unix.

svn path=/nixos/trunk/; revision=22106
2010-06-02 19:59:44 +00:00
Eelco Dolstra
8b308272df * We don't use pam_console anymore.
svn path=/nixos/trunk/; revision=22104
2010-06-02 17:11:20 +00:00
Eelco Dolstra
d67e6e6285 * Remove some `stopOn = "ip-down"' declarations since they probably
don't do the right thing (e.g. they don't distinguish between
  network interfaces).

svn path=/nixos/trunk/; revision=22102
2010-06-02 16:19:48 +00:00
Eelco Dolstra
d317d83ba8 * Remove `stopOn = "shutdown"' which doesn't work.
svn path=/nixos/trunk/; revision=22101
2010-06-02 16:05:09 +00:00
Eelco Dolstra
8519e72ccc * Don't stop tty-backgrounds during shutdown.
svn path=/nixos/trunk/; revision=22100
2010-06-02 16:04:30 +00:00
Eelco Dolstra
ad93acc295 * Make all Upstart jobs shut down on the `starting shutdown' event.
This ensures that they're gone by the time the shutdown job runs, so
  it doesn't have to stop them itself.
* Don't respawn tasks, as it doesn't seem useful (if they fail they're
  likely to fail again if they're restarted).

svn path=/nixos/trunk/; revision=22099
2010-06-02 16:04:08 +00:00
Eelco Dolstra
b135e38bea * atd's postStop action should be unnecessary.
svn path=/nixos/trunk/; revision=22095
2010-06-01 20:42:33 +00:00
Eelco Dolstra
94b2268192 * Start "exec" jobs using the "script" stanza to allow redirects in
the job's "exec" to work properly.

svn path=/nixos/trunk/; revision=22094
2010-06-01 20:41:59 +00:00
Eelco Dolstra
95a9c5dd77 * Log the standard output/error of Upstart jobs to
/var/log/upstart/<jobname> rather than spamming the console with it.

svn path=/nixos/trunk/; revision=22093
2010-06-01 19:44:23 +00:00
Eelco Dolstra
e450e4551f * tty-backgrounds: don't do a setcfg action on the console if the
current theme is the same.  This prevents the console from being
  blanked during boot.

svn path=/nixos/trunk/; revision=22092
2010-06-01 18:30:17 +00:00
Eelco Dolstra
18fd0a61de * Add `sleep' to the initrd.
svn path=/nixos/trunk/; revision=22089
2010-06-01 17:09:34 +00:00
Eelco Dolstra
9c900ee15c * Updates for the dynamically linked splash helper.
svn path=/nixos/trunk/; revision=22087
2010-06-01 16:38:42 +00:00
Eelco Dolstra
dc49a0ce3f * Don't use klibc in the initrd. It's simpler (and slightly smaller)
to use the standard (coreutils) tools.
* Use util-linux's `switch_root' to switch over to the target root
  FS.  It automatically moves over the /dev, /proc and /sys from stage
  1, so stage 2 doesn't need to set them up again.

svn path=/nixos/trunk/; revision=22085
2010-06-01 15:53:24 +00:00
Eelco Dolstra
eb4c33eeca * Added an option to enable support for 32-bit binaries (such as Wine
or Google Earth) on 64-bit NixOS on NVIDIA hardware.  The 32-bit
  OpenGL library is symlinked from /var/run/opengl-driver-32, which is
  added to the LD_LIBRARY_PATH so that 32-bit binaries can find it.

svn path=/nixos/trunk/; revision=22062
2010-05-30 22:00:52 +00:00
Eelco Dolstra
540c673364 * Enable the `chfn' program. Note that by default non-root users are
still not permitted to change their account information, as
  specified in login.defs.

svn path=/nixos/trunk/; revision=22049
2010-05-28 14:59:34 +00:00
Eelco Dolstra
7d9644f725 svn path=/nixos/trunk/; revision=22045 2010-05-28 11:24:41 +00:00
Eelco Dolstra
eade772338 * Don't show the contents of linuxPackages in the manual.
svn path=/nixos/trunk/; revision=22044
2010-05-28 11:21:40 +00:00
Eelco Dolstra
ca1910e4b0 * Seems that we don't need the aufs2 mount helper.
svn path=/nixos/trunk/; revision=22038
2010-05-28 09:35:24 +00:00
Eelco Dolstra
f9f224972a * Use AUFS2.
svn path=/nixos/trunk/; revision=22033
2010-05-28 07:09:34 +00:00
Yury G. Kudryashov
32d41f439d Remove KDE3 desktop
We have no full KDE3 desktop anyway. KDE3 desktop was broken for a while, and nobody noticed.

svn path=/nixos/trunk/; revision=21996
2010-05-27 09:35:36 +00:00
Eelco Dolstra
fa183e5472 * Expose networking.interfaces as an attribute set keyed on the
interface name through the derived option networking.ifaces.  This
  makes it easier to get information about specific interfaces
  (e.g. `nodes.router.config.networking.ifaces.eth2.ipAddress').
  Really networking.interfaces should be an attribute set.

svn path=/nixos/trunk/; revision=21938
2010-05-21 14:12:03 +00:00
Eelco Dolstra
4dac9e5814 * Allow more complex network topologies in distributed tests. Each
machine can now declare an option `virtualisation.vlans' that causes
  it to have network interfaces connected to each listed virtual
  network.  For instance,

    virtualisation.vlans = [ 1 2 ];

  causes the machine to have two interfaces (in addition to eth0, used
  by the test driver to control the machine): eth1 connected to
  network 1 with IP address 192.168.1.<i>, and eth2 connected to
  network 2 with address 192.168.2.<i> (where <i> is the index of the
  machine in the `nodes' attribute set).  On the other hand,
  
    virtualisation.vlans = [ 2 ];

  causes the machine to only have an eth1 connected to network 2 with
  address 192.168.2.<i>.  So each virtual network <n> is assigned the
  IP range 192.168.<n>.0/24.

  Each virtual network is implemented using a separate multicast
  address on the host, so guests really cannot talk to networks to
  which they are not connected.

* Added a simple NAT test to demonstrate this.

* Added an option `virtualisation.qemu.options' to specify QEMU
  command-line options.  Used to factor out some commonality between
  the test driver script and the interactive test script.

svn path=/nixos/trunk/; revision=21928
2010-05-20 21:07:32 +00:00
Eelco Dolstra
ad8ed39285 * It should not be necessary to run ntpd in the guest.
svn path=/nixos/trunk/; revision=21925
2010-05-20 14:51:46 +00:00
Yury G. Kudryashov
2dfd9b51ae gnupg2 is now called gnupg
svn path=/nixos/trunk/; revision=21889
2010-05-19 21:11:46 +00:00
Yury G. Kudryashov
12e43068cf More verbose udev log
svn path=/nixos/trunk/; revision=21881
2010-05-19 19:15:49 +00:00
Marc Weber
674d396576 adding initial support for proprietary ati drivers You have to add some impure paths, see: http://thread.gmane.org/gmane.linux.distributions.nixos/4145
svn path=/nixos/trunk/; revision=21847
2010-05-18 19:36:11 +00:00
Lluís Batlle i Rossell
7d6db6ac0c Fixing the pcscd job (daemonType)
svn path=/nixos/trunk/; revision=21845
2010-05-18 17:57:03 +00:00
Yury G. Kudryashov
a0b97de260 Use polkit-agent-helper-1 from libexec/polkit-1
svn path=/nixos/trunk/; revision=21844
2010-05-18 16:46:32 +00:00
Eelco Dolstra
1133f664bd * Fix https printing (the symlink to ipp was broken).
svn path=/nixos/trunk/; revision=21841
2010-05-18 15:19:52 +00:00
Lluís Batlle i Rossell
ee8ba3bb79 Updating bashrc, so it does not leave in PATH (and other environment variables) a void element, which
the linux kernel would take as '.'.
This fixes the bug of linux looking into '.' for executables.


svn path=/nixos/trunk/; revision=21818
2010-05-17 14:15:18 +00:00
Lluís Batlle i Rossell
f13cf2cee0 Adding example for the fonts.extraFonts
(thanks roconnor)


svn path=/nixos/trunk/; revision=21817
2010-05-17 14:09:22 +00:00
Lluís Batlle i Rossell
b15e575961 Renaming the tor services lowercase.
svn path=/nixos/trunk/; revision=21810
2010-05-16 22:22:34 +00:00
Eelco Dolstra
7484774172 * Activate software RAID devices from udev. This makes the swraid
Upstart jobs unnecessary.
* Support having the root filesystem on swraid.

svn path=/nixos/trunk/; revision=21807
2010-05-16 20:40:04 +00:00
Eelco Dolstra
edee370883 * The default action for udevadm trigger' changed from add' to
`change'.  At boot time, however, we want an `add' event to trigger
  certain rules (e.g. LVM and mdadm).

svn path=/nixos/trunk/; revision=21804
2010-05-16 19:02:45 +00:00
Nicolas Pierron
1f2db38e9a Fix swraid for config which do not have any raid devices.
svn path=/nixos/trunk/; revision=21800
2010-05-16 16:36:01 +00:00
Nicolas Pierron
49dcb07bd9 Fix bad substitution of mdadm program name.
svn path=/nixos/trunk/; revision=21799
2010-05-16 16:35:51 +00:00
Lluís Batlle i Rossell
a862661835 Adding the Tor service
(patch by roconnor)


svn path=/nixos/trunk/; revision=21795
2010-05-16 16:20:00 +00:00
Eelco Dolstra
8989d7a3d5 * Udev no longer likes the "%k" name in the kqemu rule, so remove it.
svn path=/nixos/trunk/; revision=21794
2010-05-16 09:39:41 +00:00
Yury G. Kudryashov
7836f89242 stage-1.nix: copy libudev.so, verbose log
svn path=/nixos/trunk/; revision=21793
2010-05-15 21:28:31 +00:00
Yury G. Kudryashov
7ae39feedb Get rid of extraSetuidPrograms.
Also state in description that it is obsolete.

svn path=/nixos/trunk/; revision=21777
2010-05-14 21:01:06 +00:00
Yury G. Kudryashov
03caab4572 Enable polkit-1
Now both polkit-1 and old policykit are enabled. Packages that can use both will
be migrated to new polkit-1, than old one can be disabled.

svn path=/nixos/trunk/; revision=21776
2010-05-14 20:28:04 +00:00
Marc Weber
680818c2cc postgresql: allow adding plugins ot $libdir
svn path=/nixos/trunk/; revision=21692
2010-05-09 20:42:00 +00:00
Lluís Batlle i Rossell
8b69834669 Fixing a syntax error in the vsftpd module I added in a recent commit.
svn path=/nixos/trunk/; revision=21687
2010-05-09 15:38:48 +00:00
Lluís Batlle i Rossell
4ee2a8a29a Fixing the UTF-8 in openssh sshd (passing to it the LOCALE_ARCHIVE - that
requieres a patch in openssh that I just commited to nixpkgs)

Before this, in the shell spawned, backspace could not work over UTF-8 strings in the readline.


svn path=/nixos/trunk/; revision=21679
2010-05-09 12:45:57 +00:00
Lluís Batlle i Rossell
825923a051 Adding the 'awesome' window manager to nixos.
I made the system sw path include /etc/xdg - awesome looks for some file
in the XDG_CONFIG_DIRS, which in bashrc is set to point to the profiles/etc/xdg


svn path=/nixos/trunk/; revision=21675
2010-05-08 23:24:00 +00:00
Ludovic Courtès
4c1af311e1 avahi-daemon: Ensure that /var/run/avahi-daemon exists.
svn path=/nixos/trunk/; revision=21673
2010-05-08 22:28:26 +00:00
Lluís Batlle i Rossell
0d92459fb5 Fixing vsftpd regarding the anonymous user (some script lines had to be run
only in the case the anonymous user service were enabled)


svn path=/nixos/trunk/; revision=21669
2010-05-08 19:12:36 +00:00
Lluís Batlle i Rossell
f8ff75202e Fixing the mountd nfs upstart script (about /etc/exports and its contents)
svn path=/nixos/trunk/; revision=21668
2010-05-08 19:02:54 +00:00
Nicolas Pierron
06bfb319fe Add extra module argument to provide a nesting.clone option. This option
does the same as nesting.children except that each configuration inherits
from the top-level configuration.

svn path=/nixos/trunk/; revision=21663
2010-05-08 17:18:26 +00:00
Nicolas Pierron
1ba1b66efd Add services.xserver.screenSection to add additional screen options.
svn path=/nixos/trunk/; revision=21662
2010-05-08 17:18:22 +00:00
Nicolas Pierron
43fcf8a2b2 Fix swraid device detection on boot.
svn path=/nixos/trunk/; revision=21661
2010-05-08 17:18:16 +00:00
Eelco Dolstra
c1f7622512 * Improve obsolete/deprecated option warnings.
svn path=/nixos/trunk/; revision=21653
2010-05-07 15:14:50 +00:00
Ludovic Courtès
8fcbaefd2e Refer to IceCat instead of Firefox.
svn path=/nixos/trunk/; revision=21636
2010-05-06 20:52:06 +00:00
Lluís Batlle i Rossell
e4e3789dad Make privoxy run with uid=privoxy.
Patch by Russell O'Connor, sent to nix-dev.


svn path=/nixos/trunk/; revision=21551
2010-05-02 04:38:45 +00:00
Lluís Batlle i Rossell
b690751956 Fixing the kwm nixos module - the kde3 attribute path changed in nixpkgs.
svn path=/nixos/trunk/; revision=21549
2010-05-01 20:25:57 +00:00
Lluís Batlle i Rossell
65a4991eee I forgot the username in the system cron job for logrotate. So it did not work until now.
svn path=/nixos/trunk/; revision=21479
2010-05-01 13:23:32 +00:00
Marc Weber
6daed6b8d2 setting default of copySystemConfiguration to false.
http://thread.gmane.org/gmane.linux.distributions.nixos/3990

svn path=/nixos/trunk/; revision=21450
2010-04-30 07:43:29 +00:00
Yury G. Kudryashov
0829b8ea8c Link /etc/{xdg,dbus-1} if KDE is enabled
svn path=/nixos/trunk/; revision=21449
2010-04-30 07:36:24 +00:00
Yury G. Kudryashov
9d33d05269 Add $profile/lib/qt4/plugins to QT_PLUGIN_PATH
svn path=/nixos/trunk/; revision=21448
2010-04-30 07:36:19 +00:00
Lluís Batlle i Rossell
27886d8288 Fixing an xml manual tag (the manual did not validate, so, its build failed)
svn path=/nixos/trunk/; revision=21440
2010-04-29 19:06:18 +00:00
Lluís Batlle i Rossell
cf3f1e9f23 INFOPATH fix; the info.nix module should not set the INFOPATH variable in bashrc,
because the bashrc already cares on that, even taking into account all the usual
nixos profiles.

As a side change, I changed a tab to spaces in bashrc.


svn path=/nixos/trunk/; revision=21439
2010-04-29 18:59:05 +00:00
Lluís Batlle i Rossell
b47c2186f6 Adding logrotate to nixos. Not a very clever logrotate, though:
options 'enable' (cronjob every hour) and the config flie contents passed
as a string.


svn path=/nixos/trunk/; revision=21438
2010-04-29 18:54:08 +00:00
Rob Vermaas
310eefffe7 added virtualisation.diskSize option to specify default image size of disk in qemu-kvm vm
svn path=/nixos/trunk/; revision=21422
2010-04-29 12:37:26 +00:00
Marc Weber
ce642f0cc2 nixos-rebuild: accept both: -jn and -j n
svn path=/nixos/trunk/; revision=21410
2010-04-28 19:52:03 +00:00
Marc Weber
8754644faf add more documentation to distributedBuilds and what can be done if buildmachines are not always up
svn path=/nixos/trunk/; revision=21409
2010-04-28 19:52:00 +00:00
Marc Weber
d1e87dfc86 adding two new options:
- system.copySystemConfiguration (requested by Ludovic Courtès)
- system.extraSystemBuilderCmds

svn path=/nixos/trunk/; revision=21406
2010-04-28 14:55:26 +00:00
Yury G. Kudryashov
ce15e270f2 Fix non-bc change
svn path=/nixos/trunk/; revision=21326
2010-04-26 15:57:06 +00:00
Yury G. Kudryashov
69697a35bb Add /root/test-firmware to FIRMWARE_DIRS
svn path=/nixos/trunk/; revision=21317
2010-04-26 09:08:05 +00:00
Yury G. Kudryashov
be3df19bd5 Don't try to copy /root/test-firmware to /nix/store
svn path=/nixos/trunk/; revision=21316
2010-04-26 09:04:24 +00:00
Yury G. Kudryashov
226a9c8bbb Update CUPS module
* Create symlinks in cups-progs only if they aren't already here
* add tmpDir option

svn path=/nixos/trunk/; revision=21309
2010-04-25 18:27:00 +00:00
Yury G. Kudryashov
a5718503e5 Change firmware handling
This way should work with both old udev and new one.

svn path=/nixos/trunk/; revision=21308
2010-04-25 18:26:56 +00:00
Yury G. Kudryashov
a30637aba5 Really use nix-worker in nixos-rebuild
svn path=/nixos/trunk/; revision=21307
2010-04-25 18:26:51 +00:00
Sander van der Burg
d9528767af Added preliminary Apache Felix service
svn path=/nixos/trunk/; revision=21244
2010-04-22 15:13:50 +00:00
Lluís Batlle i Rossell
a37743794d I forgot a 'toString' in front of an integer
svn path=/nixos/trunk/; revision=21242
2010-04-22 14:54:09 +00:00
Lluís Batlle i Rossell
d7406769ac Making /var/run/utmp writable by the 'utmp' group.
Then, people can choose a setgid utmp for their xterm, konsole or whatever to get the terminals
reported there.


svn path=/nixos/trunk/; revision=21238
2010-04-22 13:56:26 +00:00
Lluís Batlle i Rossell
b7dab319e5 Fixing the tty group and permissions for vt consoles
svn path=/nixos/trunk/; revision=21231
2010-04-22 10:11:32 +00:00
Lluís Batlle i Rossell
41bf426a66 Making the httpd prefork basic settings configurable.
I kept the defaults as they where, to avoid surprises.
(150 httpd processes simultaneously answering? Too much for my machines)


svn path=/nixos/trunk/; revision=21220
2010-04-21 20:55:57 +00:00
Eelco Dolstra
8874226fa3 * Add rfkill to the system path.
svn path=/nixos/trunk/; revision=21201
2010-04-21 11:37:52 +00:00
Eelco Dolstra
6c16ff29a5 * Don't do "kbd_mode -u" because it kicks the X server out of raw
mode, and isn't needed anyway.

svn path=/nixos/trunk/; revision=21182
2010-04-20 14:35:12 +00:00
Sander van der Burg
2936d7062d Added creation of the disnix group on first startup, if the disnix service is enabled
svn path=/nixos/trunk/; revision=21164
2010-04-19 13:26:21 +00:00
Lluís Batlle i Rossell
a008d6b391 Fixing the cups-progs build problems, for the cupsd module. It wrote over other
store paths.


svn path=/nixos/trunk/; revision=21161
2010-04-19 10:54:39 +00:00
Lluís Batlle i Rossell
33ed225a84 Making the /dev and /dev/shm tmpfs sizes configurable.
By default, they take the usual value of "50% of physical RAM".

As /dev/shm can be filled by anyone, and tmpfs does not trigger the OOM killer (and
can hang the machine due to a lack of RAM), I need to configure that down
in order to avoid crashes.

There is still left the /var/run/nscd tmpfs filesystem, also created with 50%
of the RAM, but at least not writeable by anyone. We could find a reasonable
low value for that, or allow configuration.


svn path=/nixos/trunk/; revision=21140
2010-04-17 15:20:13 +00:00
Sander van der Burg
1c9eb048c9 - Implemented rootPassword option to automatically configure the root password (by default it's empty, which you usually don't want)
- Implemented initialScript option to configure database properties on first startup (such as granting permissions)


svn path=/nixos/trunk/; revision=21135
2010-04-16 18:06:23 +00:00
Rob Vermaas
94e36ec1c7 virtualisation/qemu-kvm.nix: use noacl option for hostfs mount
svn path=/nixos/trunk/; revision=21129
2010-04-16 15:53:54 +00:00
Rob Vermaas
46b109e97e revert previous commit
svn path=/nixos/trunk/; revision=21128
2010-04-16 15:45:59 +00:00
Rob Vermaas
b75d15a9a8 virtualisation: add option to switch off readonly host fs in vm
svn path=/nixos/trunk/; revision=21126
2010-04-16 15:09:47 +00:00
Yury G. Kudryashov
8e8554242f Remove extraLinkPaths, thanks to Pierron for explanation
Now pathsToLink=["/include"] in configuration.nix will add /include instead of overwriting.

svn path=/nixos/trunk/; revision=21111
2010-04-16 05:09:10 +00:00
Marco Maggesi
c423f16f69 Fix job name in nixos/modules/programs/blcr.nix
svn path=/nixos/trunk/; revision=21106
2010-04-15 17:14:44 +00:00
Yury G. Kudryashov
267e0af8db A few typos in previous commits
svn path=/nixos/trunk/; revision=21105
2010-04-15 17:02:33 +00:00
Yury G. Kudryashov
1e83fe6122 Remove tabs
svn path=/nixos/trunk/; revision=21104
2010-04-15 15:47:26 +00:00
Yury G. Kudryashov
8324ccf755 Add /var/run/current-system/sw to NIX_PROFILES
Also adds a possibility to just add KDE packages to systemPackages.

svn path=/nixos/trunk/; revision=21103
2010-04-15 15:47:15 +00:00
Yury G. Kudryashov
a26d31d04c Add support for custom CUPS drivers
Use buildEnv for cups-prog.

svn path=/nixos/trunk/; revision=21102
2010-04-15 15:47:07 +00:00
Yury G. Kudryashov
dcd0be3351 Allow additions to pathsToLink
svn path=/nixos/trunk/; revision=21101
2010-04-15 15:46:55 +00:00
Yury G. Kudryashov
4d39d70406 Start ssh-agent or gpg-agent even if called by kdm
svn path=/nixos/trunk/; revision=21100
2010-04-15 15:46:47 +00:00
Yury G. Kudryashov
916fbfa070 Add xf86-linux-wacom.
Mostly reverts my previous commit.

svn path=/nixos/trunk/; revision=21099
2010-04-15 15:46:38 +00:00
Marco Maggesi
37746e4fb3 Add support for BLCR: modules/programs/blcr.nix
svn path=/nixos/trunk/; revision=21092
2010-04-15 12:11:33 +00:00
Rob Vermaas
b42c2ecc13 * tomcat module: access logging per virtual host and pass right timezone
svn path=/nixos/trunk/; revision=21065
2010-04-14 09:31:23 +00:00
Lluís Batlle i Rossell
4c9ff7f904 Making postfix properly start on boot.
We could not start on 'filesystems', because filesystems is written as an upstart task.

Additionally, as upstart calls the postfix start/stop script and it does not act as a
daemon, we write it as a preStart/postStop job. Then we don't have monitoring or respawn,
but at least upstart does not get confused on its state.


svn path=/nixos/trunk/; revision=21061
2010-04-13 22:47:34 +00:00
Yury G. Kudryashov
9cce36182d Remove linuxwacom: it is not compatible with new xserver
svn path=/nixos/trunk/; revision=21015
2010-04-11 20:41:06 +00:00
Yury G. Kudryashov
eea1660532 no-x-libs: s/sshd/openssh/
svn path=/nixos/trunk/; revision=21009
2010-04-11 14:47:06 +00:00
Andres Löh
289dcec9db Make acpid actions configurable.
svn path=/nixos/trunk/; revision=20986
2010-04-08 15:27:20 +00:00
Eelco Dolstra
6c710f7d2b * Provide an example for services.printing.cupsdConf.
* Change the default CUPS log level to "info".

svn path=/nixos/trunk/; revision=20957
2010-04-06 13:25:00 +00:00
Eelco Dolstra
755ee8bd08 * Add a configuration option `services.printing.cupsdConf' to allow
appending verbatim text to the CUPS daemon configuration file.
* cupsd.conf: set ErrorLog properly.

svn path=/nixos/trunk/; revision=20954
2010-04-06 11:57:15 +00:00
Sander van der Burg
02e4a78c71 Disnix should also remain active during a switch
svn path=/nixos/trunk/; revision=20949
2010-04-05 20:35:08 +00:00
Sander van der Burg
b904954793 Updated disnix service for the 0.1 release
svn path=/nixos/trunk/; revision=20917
2010-04-01 14:53:17 +00:00
Michael Raskin
6788d457dc Make security type configurable
svn path=/nixos/trunk/; revision=20667
2010-03-16 17:17:37 +00:00
Michael Raskin
11f8647d73 Add a default share to Samba to make creating simple fileserver easier
svn path=/nixos/trunk/; revision=20665
2010-03-16 16:34:27 +00:00
Eelco Dolstra
bd81b7a173 * Urgh, this should never have been committed.
svn path=/nixos/trunk/; revision=20660
2010-03-16 15:15:17 +00:00
Eelco Dolstra
c1e313b5e1 * Remove obsolete references to kernelPackages in Nixpkgs.
svn path=/nixos/trunk/; revision=20647
2010-03-16 12:10:06 +00:00
Eelco Dolstra
5b5aefa030 * Remove some obsolete stuff.
svn path=/nixos/trunk/; revision=20631
2010-03-15 13:41:21 +00:00
Ludovic Courtès
18542f6424 GNU: Don't require modules since we don't need to.
svn path=/nixos/trunk/; revision=20584
2010-03-11 22:54:47 +00:00
Eelco Dolstra
176f6c52dd * Change the name of the SSH privilege separation user account back to
"sshd" because changing it to "opensshd" causes breakage (like the
  activation script saying "useradd: UID 2 is not unique.").  Also,
  OpenSSH requires it to be named "sshd", I think.

svn path=/nixos/trunk/; revision=20577
2010-03-11 18:07:20 +00:00
Ludovic Courtès
a6b89666fd First stab at a GNU module.
svn path=/nixos/trunk/; revision=20576
2010-03-11 17:02:57 +00:00
Ludovic Courtès
8e16742b79 Update users of `services.sshd'.
svn path=/nixos/trunk/; revision=20575
2010-03-11 17:02:53 +00:00
Ludovic Courtès
d1b4b7fd28 Rename services.sshd' to services.openssh'.
svn path=/nixos/trunk/; revision=20574
2010-03-11 17:02:49 +00:00
Ludovic Courtès
bcd3cd85f3 installation-cd: Add an `installer.basePackages' option.
svn path=/nixos/trunk/; revision=20573
2010-03-11 17:02:36 +00:00
Eelco Dolstra
a104f07a07 * Move the definition of the Nix build users out of user-groups.nix to
nix-daemon.nix.
* Add an option ‘nix.nrBuildUsers’ to allow the number of build users
  to be overriden.

svn path=/nixos/trunk/; revision=20571
2010-03-11 16:50:08 +00:00
Lluís Batlle i Rossell
9f5d77f78d Still problems with nfs-kernel with only the client enabled.
Fix the upstart script 'start on' part.

svn path=/nixos/trunk/; revision=20555
2010-03-11 12:56:40 +00:00
Lluís Batlle i Rossell
48e9e1282a Fixing the evaluation of the "system tarball pc", adapting it to the latest
nixpkgs changes about 'platform'.


svn path=/nixos/trunk/; revision=20494
2010-03-09 14:37:59 +00:00
Eelco Dolstra
43d6b17d87 * In the NixOS tests, send syslog messages to the serial port (so that
they appear in the build log of the test).

svn path=/nixos/trunk/; revision=20490
2010-03-09 13:31:20 +00:00
Lluís Batlle i Rossell
dfb89ec8c3 nfs: the statd daemon should be started after nfs only if the nfs server is
enabled.

OTH, I don't know why statd may depend at all on nfsd being started.


svn path=/nixos/trunk/; revision=20402
2010-03-05 11:05:37 +00:00
Eelco Dolstra
1065e86642 * In nixos-rebuild, build config.environment.nix before trying nixFallback or nixUnstable.
svn path=/nixos/trunk/; revision=20376
2010-03-04 14:38:53 +00:00
Sander van der Burg
787b5cd7b9 Implemented enableOSSEmulation option, which can be used to disable OSS emulation. On my home PC OSS emulation gives me a lot of annoying problems
svn path=/nixos/trunk/; revision=20351
2010-03-03 14:01:13 +00:00
Sander van der Burg
3d87a133a0 Added gstreamer plugins to the systemPackages, so that Phonon does not crash on shutdown when using KDE 4.4.x
svn path=/nixos/trunk/; revision=20350
2010-03-03 13:22:06 +00:00
Lluís Batlle i Rossell
b6090bff9d Making the bootloaders respect the platform.kernelTarget set in nixpkgs.
svn path=/nixos/trunk/; revision=20283
2010-02-27 22:17:10 +00:00
Lluís Batlle i Rossell
9002335101 Making nixos handle the nixpkgs 'platform' parameter.
svn path=/nixos/trunk/; revision=20274
2010-02-27 18:37:12 +00:00
Lluís Batlle i Rossell
bc4e159d0e Fixing a terrible bug in nixos nfs-kernel server, related to the exports file.
The file contents were taken as a file path. This resulted in a system with a totally broken /etc:
lrwxrwxrwx 1 root nixbld   51 22 feb 21:45 bashrc -> /nix/store/gh71a6w50cxrl4124kxfn24yi0b7aaka-useradd
lrwxrwxrwx 1 root nixbld   44 22 feb 21:45 nix.conf -> 192.168.1.4(rw,no_root_squash,no_all_squash)
lrwxrwxrwx 1 root nixbld   58 22 feb 21:45 inputrc -> /nix/store/1czhdj7q74dc556frqrh51jyshfsxhl3-bashrc-user.sh
lrwxrwxrwx 1 root nixbld   51 22 feb 21:45 nsswitch.conf -> /nix/store/qsgsli992hd1g8245d8am9izn9xmw90x-inputrc
lrwxrwxrwx 1 root nixbld   20 22 feb 21:45 exports -> /home/sheevaplugroot

Notice that the inputrc has strange contents. In my case, that disabled me to type 's' or 'i' (at least) in any new interactive shell.

If you notice, the 'exports' symlink should point to a store file, which contents had to look like:
/home/sheevaplugroot 192.168.1.4(rw,no_root_squash,no_all_squash)

This patch achieves this later behaviour rather than the former.


svn path=/nixos/trunk/; revision=20181
2010-02-22 21:41:49 +00:00
Eelco Dolstra
0bae6c2c18 * Disable the "smart" tab completion again, because it causes lots of
problems:

  - It doesn't support filenames with spaces.
  - It inserts a space after the filename when tab-completing in an
    "svn" command.
  - Many people find it annoying that tab-completion on commands like
    "tar" only matches filenames with the "right" extension.
  - Lluís reported bash apparently crashing on some tab completions.

  We should probably make this optional, and maybe use a subset of the
  bash_completion file in the bash distribution that works.

svn path=/nixos/trunk/; revision=20179
2010-02-22 17:20:12 +00:00
Eelco Dolstra
cc0a2a6944 * Don't say `jobs.foo = mkIf condition { ... }' because that will
create an empty job `foo' if the condition is false.  Instead use
  `jobs = optionalAttrs condition { foo = { ... }; }'.
* Enable portmap automatically when using the NFS server or client.

svn path=/nixos/trunk/; revision=20178
2010-02-22 17:12:26 +00:00
Lluís Batlle i Rossell
0fb8300bb6 Updating the nixos NFS related expressions. Thanks to Oleksandr for the
help.
I tried not to break the tests.


svn path=/nixos/trunk/; revision=20157
2010-02-21 16:26:33 +00:00
Rob Vermaas
2b7da40351 revert unintended part of the previous commit
svn path=/nixos/trunk/; revision=20123
2010-02-19 09:55:28 +00:00
Rob Vermaas
a87ee76cb3 * hydra: added option to self manage nix.machines (for buildfarm purposes)
svn path=/nixos/trunk/; revision=20121
2010-02-19 09:48:24 +00:00
Lluís Batlle i Rossell
093b51a562 Removing references to linux kernel 'vmlinuz', and making them point to 'bzImage'.
That should match with a related change in nixpkgs.


svn path=/nixos/trunk/; revision=20095
2010-02-18 11:35:39 +00:00
Rob Vermaas
f1438d3d27 tomcat: add option to enable accesslog per virtual host (default: off)
svn path=/nixos/trunk/; revision=20075
2010-02-17 12:32:19 +00:00
Rob Vermaas
c17a76279d zabbix agent: extraConfig
svn path=/nixos/trunk/; revision=20048
2010-02-16 12:51:28 +00:00
Eelco Dolstra
f013236f1e * Idem for zabbix-agent.
svn path=/nixos/trunk/; revision=20040
2010-02-16 10:15:20 +00:00
Eelco Dolstra
9127795e4a * Make sure that Upstart notices when the Zabbix server crashes so
that it can be restarted.  Zabbix is kind of hard to monitor, so use
  a trick with an open fifo to detect when it goes down.

svn path=/nixos/trunk/; revision=20039
2010-02-16 10:10:59 +00:00
Lluís Batlle i Rossell
1dd3162d7c First attempt at trying to get a tarball of a bootable nixos system.
What I want with this derivation is to allow the sheevaplug nixos to
build a tarball with all the needed files to boot. Then, this can be
unpacked into an SD card, or into a NFS/TFTP server, and then the
user can boot the system with help of the uboot console.
By now, I have only tried to build the tarball in a PC, in order
to develop the nix expressions quicker.

There is nothing written specialy for the Sheevaplug in all this,
by now.


svn path=/nixos/trunk/; revision=20035
2010-02-15 23:27:51 +00:00
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
Eelco Dolstra
34341d810a * Remove a debug line.
svn path=/nixos/trunk/; revision=19285
2010-01-07 13:53:09 +00:00
Marc Weber
fdc63c54e4 enhance phpIni documentation
readd r19267 (the issue should be fixed now)

Eelco Dolstra and Nicolas Pierron both kept asking me to pay attention
to the rendered manual. There is one catch: example settings such as
pkgs.kernelPackages_2_6_25 are correct however they don't render
properly. Moreover you don't want those examples to be evaluated (maybe
compiling a kernel ?) when building the manual only.
So use Strings and add a copy & paste note.
This is still a hacky. Maybe a kind of typed "verbatim" expression
should be added (?)

svn path=/nixos/trunk/; revision=19281
2010-01-07 09:01:40 +00:00
Eelco Dolstra
ac7c404deb * Revert r19267 - it causes a corrupt Apache Upstart job to be
generated.  E.g. in
  http://hydra.nixos.org/build/208321/nixlog/8/raw:

    webserver# init:/etc/init/httpd.conf:14: Unexpected token

svn path=/nixos/trunk/; revision=19280
2010-01-06 23:37:30 +00:00
Eelco Dolstra
ed7d096624 * Resolve $device (e.g. from /dev/disk/by-label/foo -> /dev/sda2),
because /proc/swaps contains resolved paths as well.  Without this,
  the swap device will be turned off again by the $unused code.

svn path=/nixos/trunk/; revision=19278
2010-01-06 22:41:59 +00:00
Eelco Dolstra
ec3398e4b2 * Move the serial console kernel parameters to test-instrumentation.nix.
svn path=/nixos/trunk/; revision=19275
2010-01-06 21:16:57 +00:00
Eelco Dolstra
83478a0800 * Add klibc and klibcShrunk to the CD because they're always needed
during an installation.

svn path=/nixos/trunk/; revision=19273
2010-01-06 20:51:10 +00:00
Eelco Dolstra
8ebde1ea8a * Add the modules for all block devices.
svn path=/nixos/trunk/; revision=19271
2010-01-06 20:09:53 +00:00
Eelco Dolstra
bb236f99de * Urgh, socat ignores SIGCHLD, which causes Nix builds to fail.
svn path=/nixos/trunk/; revision=19270
2010-01-06 18:03:31 +00:00
Marc Weber
99644df67a customizable PHPRC
svn path=/nixos/trunk/; revision=19267
2010-01-06 17:05:57 +00:00
Eelco Dolstra
1b21115f61 * Support creating a virtual disk in the test driver.
svn path=/nixos/trunk/; revision=19263
2010-01-06 14:37:23 +00:00
Eelco Dolstra
1da72333d9 * Put the NixOS boot at the top so that it's the default.
svn path=/nixos/trunk/; revision=19255
2010-01-06 12:24:20 +00:00
Eelco Dolstra
c9e4b46d48 * Ugly hack: for CIFS mounts, retry the mount a few times (just as in
pkgs/build-support/vm).  This should make the NixOS regression tests
  more robust on heavily loaded systems, where they now frequently
  fail:

  server# mounting //10.0.2.4/qemu on /hostfs...
  server# [    8.233991] Slow work thread pool: Starting up
  server# [    8.234721] Slow work thread pool: Ready
  server# [   23.271708]  CIFS VFS: No response for cmd 114 mid 1
  server# [   23.272443]  CIFS VFS: cifs_mount failed w/return code = -112
  server# mount: Host is down
  server# [   23.275188] Kernel panic - not syncing: Attempted to kill init!

  Maybe there is a configurable timeout somewhere, which would be much
  nicer...

svn path=/nixos/trunk/; revision=19248
2010-01-06 00:25:14 +00:00
Eelco Dolstra
bc68c2985c * Added a function waitForX, which returns when the X server accepts
connections.
* In the root shell, source /etc/bashrc and set $HOME and $DISPLAY.  

svn path=/nixos/trunk/; revision=19247
2010-01-05 23:59:29 +00:00
Eelco Dolstra
5cc99487cb * A function to wait until a window exists.
svn path=/nixos/trunk/; revision=19246
2010-01-05 23:38:13 +00:00
Eelco Dolstra
73668f41da * Added an "auto" pseudo display manager that logs in a user
automatically.  This is mostly useful for testing.  (KDM also has
  this feature, but it's nice not to depend on KDE for non-KDE tests.)

svn path=/nixos/trunk/; revision=19239
2010-01-05 15:32:14 +00:00
Eelco Dolstra
62476f2816 * Added a module for IceWM.
svn path=/nixos/trunk/; revision=19238
2010-01-05 15:30:56 +00:00
Eelco Dolstra
9889d9f9f8 * Remove most default kernel options since they have no effect. Also,
don't put them in a default, so that they can easily be added to.

svn path=/nixos/trunk/; revision=19232
2010-01-05 13:11:12 +00:00
Eelco Dolstra
7541141a7a * Send stderr to /dev/ttyS0 (so that it doesn't pollute the socket
connection).

svn path=/nixos/trunk/; revision=19226
2010-01-05 11:42:08 +00:00
Eelco Dolstra
170331be30 * Don't use /hostfs to signal the test driver that a VM is up, but
write some magic string to ttyS0.  This removes the dependency on
  having a CIFS mount.
* Use a thread to process the stdout/stderr of each QEMU instance.
* Add a kernel command line parameter "stage1panic" to tell stage 1 to
  panic if an error occurs.  This is faster than waiting until
  connect() times out.

svn path=/nixos/trunk/; revision=19212
2010-01-04 18:04:57 +00:00
Eelco Dolstra
9aa0a336bc * Updated the coverage analysis handling for Linux 2.6.32. Gcov is
now merged in the kernel, and the gcda files are exported through
  debugfs in /sys/kernel/debug/gcov.

svn path=/nixos/trunk/; revision=19207
2010-01-04 13:22:43 +00:00
Eelco Dolstra
13878cb78d * Panic on out-of-memory.
svn path=/nixos/trunk/; revision=19200
2010-01-04 09:51:57 +00:00
Eelco Dolstra
790368e315 * Removed installation-cd-minimal-fresh-kernel.nix since the kernel in
installation-cd-minimal.nix is now 2.6.32.  Added most of its extra
  tools to installation-cd-base.nix.
* Put memtest86 at the bottom of the GRUB menu.  (There is currently
  no good way to do this other than to change the module inclusion
  order.)

svn path=/nixos/trunk/; revision=19188
2010-01-03 17:13:30 +00:00
Eelco Dolstra
21216b0461 * Move some kernel modules around.
svn path=/nixos/trunk/; revision=19187
2010-01-03 16:29:17 +00:00
Marc Weber
4378018164 nixos-rebuild: allow passing --fallback
replacing if .. fi by case .. esac

svn path=/nixos/trunk/; revision=19186
2010-01-03 13:36:23 +00:00
Nicolas Pierron
d2901e979d * Add support for pam_usb.
svn path=/nixos/trunk/; revision=19185
2010-01-03 11:59:08 +00:00
Eelco Dolstra
64c75274e1 * Use Linux 2.6.32 on the installation CD.
svn path=/nixos/trunk/; revision=19166
2010-01-01 16:26:01 +00:00
Nicolas Pierron
81d621b4f7 * Replace blowfish by AES, since recent CPU could have optimisation for it.
* Miss-interpretation of the --skip option of cryptsetup.  Ciphered partition labels are not supported.  Labels are erased when doing mkswap on the ciphered partition.
* Avoid doing swapon on devices which are already listed in /proc/swaps.
* Remove no longer listed devices with only one swapoff command.

svn path=/nixos/trunk/; revision=19164
2009-12-31 13:56:47 +00:00
Sander van der Burg
df21f0f06d Made a small fix because I kept receiving errors about: diff command not found. It also makes my system horribly slow.
svn path=/nixos/trunk/; revision=19148
2009-12-29 21:23:22 +00:00
Nicolas Pierron
4cf78fdb77 * Use postStart instead of preStart.
* Assemble devices only if there is a new entry.
* Add 'new-raid-array' flag to assemble new arrays.
* Emit new-devices flag to triggers the 'filesystems' task.

svn path=/nixos/trunk/; revision=19145
2009-12-29 14:10:05 +00:00
Nicolas Pierron
e70214c853 Remove loop of new-device messages. Add a shell script to watch new devices.
svn path=/nixos/trunk/; revision=19142
2009-12-29 10:04:54 +00:00
Nicolas Pierron
246dae96fe Add an option to cipher swap partitions.
! Not tested yet: cryptsetup depends on a missing
! udev binary.

svn path=/nixos/trunk/; revision=19131
2009-12-26 16:20:00 +00:00
Marc Weber
c0c4d575d2 autofs job fixes:
use exec so that upstart knows when automount shuts down.
If a mount is used upstart will send SIGKILL.
Automount doesn't clean up. So unmount everything using a post script.

svn path=/nixos/trunk/; revision=19105
2009-12-25 06:39:43 +00:00
Lluís Batlle i Rossell
aaac043ae5 Making an explicit dependency for nfs-kernel on portmap
svn path=/nixos/trunk/; revision=19090
2009-12-24 12:05:34 +00:00
Eelco Dolstra
9c465fedfa * Reinstate the -s flag.
svn path=/nixos/trunk/; revision=19055
2009-12-20 22:03:32 +00:00
Eelco Dolstra
57f70db611 * Revert r19003 for now, because wpa_supplicant 0.6.9 (in the Nixpkgs
trunk) doesn't have a -s flag.  0.7.0 in the stdenv branch
  presumably does, but it's marked as unstable upstream.

svn path=/nixos/trunk/; revision=19047
2009-12-20 16:51:22 +00:00
Marc Weber
93cb9f819d cosmetic: remove redundancy
svn path=/nixos/trunk/; revision=19040
2009-12-18 15:08:50 +00:00
Eelco Dolstra
01491abbfa * Handle the case where initScriptBuilder is not set.
svn path=/nixos/trunk/; revision=19014
2009-12-17 12:35:58 +00:00
Eelco Dolstra
44dafe885b * Don't enable this by default.
svn path=/nixos/trunk/; revision=19012
2009-12-17 11:43:12 +00:00
Marc Weber
4ff6821a03 module creating /sbin/init
svn path=/nixos/trunk/; revision=19009
2009-12-17 06:04:36 +00:00
Lluís Batlle i Rossell
483ee6219e Fixing the shutdown script, for the not-that-strange case of having
/nix bind mounted from a fs not rootfs.

As niksnut found, if the sources of bind mounted directories are
umounted before remounting them as "ro", a "mount -o remount,ro" on the
bind targets will not leave the filesystem properly umounted, the same
way as a "-o remount,ro" would do on a usual filesystem.

So, the trick of always remounting as 'ro' before attempting an umount seems
to fix the problem.

svn path=/nixos/trunk/; revision=19008
2009-12-16 23:59:05 +00:00
Eelco Dolstra
aa445933a7 * Include some more firmware in the installation CD.
svn path=/nixos/trunk/; revision=19007
2009-12-16 23:52:02 +00:00
Lluís Batlle i Rossell
eea026d321 Enabling back the i8042 module loading at initrd. Otherwise, some
may not get any keyboard driver loaded (as I experienced).

svn path=/nixos/trunk/; revision=19006
2009-12-16 23:45:10 +00:00
Lluís Batlle i Rossell
3f6ca96967 Adding an option to disable nscd.
svn path=/nixos/trunk/; revision=19004
2009-12-16 20:51:25 +00:00
Lluís Batlle i Rossell
ee434cc3d6 Using wpa_supplicant feature to log to syslog, instead of stdout (which,
in the actual upstart job, meant /dev/console)

svn path=/nixos/trunk/; revision=19003
2009-12-16 19:45:19 +00:00
Lluís Batlle i Rossell
4e8270f695 Upstart considers that syslog is ready (runs openlog())
after the connection to dbus worked.
So I set dbus depend also on syslogd.

svn path=/nixos/trunk/; revision=19002
2009-12-16 19:45:11 +00:00
Eelco Dolstra
0ca7619e62 svn path=/nixos/trunk/; revision=18999 2009-12-16 18:58:34 +00:00
Eelco Dolstra
deb4f88c2c * Let the GRUB menu builder detect whether /boot is on a different
partition from /.  If so, copy the kernels and initrds to /boot and
  use paths relative to /boot in the GRUB configuration file.  This
  makes the boot.loader.grub.bootDevice option obsolete.  (Is there a
  way to mark obsolete options?)  It also makes it unnecessary to set
  boot.loader.grub.copyKernels, although that option is still
  available since it can speed up GRUB if the Nix store is very
  large.

svn path=/nixos/trunk/; revision=18998
2009-12-16 18:57:02 +00:00
Eelco Dolstra
8d588424d2 * switch-to-configuration: force a reinstallation of GRUB whenever the
GRUB version changes.  (That's the complete version from the name
  attribute, not the boot.loader.grub.version attribute.)  The current
  version is recorded in /boot/grub/version.  This is required to
  prevent massive breakage when we change the default value of
  boot.loader.grub.version to "2".

svn path=/nixos/trunk/; revision=18997
2009-12-16 18:11:26 +00:00
Rob Vermaas
48d5ea1077 mysql.mysql becomes mysql.package because eelco likes it better
svn path=/nixos/trunk/; revision=18994
2009-12-16 15:24:15 +00:00
Rob Vermaas
52284859c5 * allow configuration of mysql version
svn path=/nixos/trunk/; revision=18993
2009-12-16 14:54:36 +00:00
Eelco Dolstra
0d095de38a * Revert r18985, but now handle the case where a nixbld user doesn't
exist yet.  Ludo's original patch only worked in the "update" case.
  Also, do this only for the nixbld group.

svn path=/nixos/trunk/; revision=18990
2009-12-16 13:35:03 +00:00
Marc Weber
6c30ba3e48 fix nix-build trouble after fresh install:
problem:
Nix only recognizes nixbld users which have nixbld set in extraGroups.
After installation the user was created by activate with group='nixbld'
and extraGroups=[]
After rebooting a conditional shell script fixed this by adding
extraGroups=["nixbld"].

This patches creates the user they way it was in the past with
group='nobody' and extraGroups=["nixbld"].

Another solution would be making nix be aware of the primary group as
well. However this would require everyone to update Nix after updating
NixOS.

svn path=/nixos/trunk/; revision=18985
2009-12-16 04:55:31 +00:00
Marc Weber
181f4bee26 fix nixos-intall(2). Now the configuration is built correctly.
Passing --arg configuration does no longer work!

svn path=/nixos/trunk/; revision=18983
2009-12-15 23:26:55 +00:00
Marc Weber
4b5864666e * refactoring kvm test and bootstrapping image.
expose makeInfo (used by test now)
  expose config hack
* Adding tests to release.nix
* fixes
* removing dependency on perl

refactoring details:
Move all configuration modules used by the NixOS installation test script
into one directory.

svn path=/nixos/trunk/; revision=18982
2009-12-15 23:26:52 +00:00
Eelco Dolstra
79bcc7618e * Make the graphical boot work on GRUB 2 in the case where /nix/store
is not on the same partition as /boot (i.e. when
  boot.loader.grub.bootDevice is set): just copy the background image
  and the font to /boot.

svn path=/nixos/trunk/; revision=18979
2009-12-15 21:11:39 +00:00
Lluís Batlle i Rossell
79073c7b3d Adding a virtualisation option: run qemu without graphics.
svn path=/nixos/trunk/; revision=18978
2009-12-15 18:49:34 +00:00
Eelco Dolstra
daa814980e * At the end of stage 1, reset /proc/sys/kernel/modprobe to
/sbin/modprobe because the sactivation script in stage 2 expects it
  to be so.

svn path=/nixos/trunk/; revision=18977
2009-12-15 18:31:21 +00:00
Eelco Dolstra
cea70d24e9 * The default default menu item (sic) should be 0, not 1. (Or is this
different for GRUB 2?)
* Clean up the option descriptions.

svn path=/nixos/trunk/; revision=18976
2009-12-15 18:21:55 +00:00
Eelco Dolstra
6c9059e717 * Added an option `boot.initrd.availableKernelModules' that specifies
modules that should be added to the initrd, but should only be
  loaded on demand (e.g. by the kernel or by udev).  This is
  especially useful in the installation CD, where we now only load the
  modules needed by the hardware.
* Enable automatic modprobing by udev in the initrd.

svn path=/nixos/trunk/; revision=18975
2009-12-15 16:38:20 +00:00
Eelco Dolstra
e8372257a1 * Reformat.
svn path=/nixos/trunk/; revision=18970
2009-12-15 14:10:06 +00:00
Eelco Dolstra
a612fd0d5e * Obsoleted boot.initrd.extraKernelModules (use
boot.initrd.kernelModules instead).

svn path=/nixos/trunk/; revision=18969
2009-12-15 14:05:01 +00:00
Michael Raskin
b628ca221d Fix Monit upstart dependency
svn path=/nixos/trunk/; revision=18964
2009-12-15 13:32:10 +00:00
Eelco Dolstra
d6108919b1 * The loopback device is in a module now. Since it's not
automatically loaded by the kernel, load it at boot time.
* Put the ext2 module (which used to be built in) in the initrd to
  prevent unexpected breakage.

svn path=/nixos/trunk/; revision=18963
2009-12-15 13:09:06 +00:00
Ludovic Courtès
3f2348ef91 Start networking services on `ip-up' when it makes sense.
svn path=/nixos/trunk/; revision=18962
2009-12-15 13:02:23 +00:00
Marc Weber
401fd84ae1 kvm installation test update + NixOS installation archive
You can run the kvm nixos installation test by:
  nix-build --no-out-link tests/test-nixos-install-from-cd.nix
It boots the installed system.
It still fails sshd isn't started (yet)

adding nixos-bootstrapping-archive:
You can install NixOS easily using any live cd now.
See README-BOOTSTRAP-NIXOS

svn path=/nixos/trunk/; revision=18950
2009-12-15 06:37:32 +00:00
Rob Vermaas
fe490f2edc * mysql-backup: option for which user to use for performing backups
svn path=/nixos/trunk/; revision=18942
2009-12-14 17:57:37 +00:00
Rob Vermaas
1dfab1d7ea * virtualisation.memorySize option to set memory size of virtual machine
svn path=/nixos/trunk/; revision=18933
2009-12-14 11:15:37 +00:00
Ludovic Courtès
83d657b102 Change the Nix build users to have no supplementary group.
For details, see:
http://thread.gmane.org/gmane.linux.distributions.nixos/3264
http://thread.gmane.org/gmane.linux.distributions.nixos/3263/focus=3289

svn path=/nixos/trunk/; revision=18918
2009-12-13 15:29:42 +00:00
Marc Weber
4d7e344f69 Adding initial version of the nixos cd insallation test script using
qemu_kvm. Installation doesn't take place yet. VM is started
printing a remote controlled "Hello".

This serves as example how to run a vm within a bulid job.

svn path=/nixos/trunk/; revision=18887
2009-12-11 00:51:13 +00:00
Marc Weber
086c3d6328 making default and timeout of grub overridable
also updating grub option names to current names

svn path=/nixos/trunk/; revision=18886
2009-12-11 00:51:07 +00:00
Rob Vermaas
038180bab8 * sshd.nix: ports attribute, to allow listening to multiple ports
svn path=/nixos/trunk/; revision=18877
2009-12-10 14:45:41 +00:00
Eelco Dolstra
9682f0ed90 svn path=/nixos/trunk/; revision=18872 2009-12-10 09:22:45 +00:00
Lluís Batlle i Rossell
60b856b115 Adding a module for system health monitoring (getting graphs generated by rrdtool
of usual system counters).
It sets up some cron jobs for collecting the data, and not that often, generating the
graphs. Then the httpd server is configured with a directory with the generated
static files.

http://www.brianlane.com/software/systemhealth/

svn path=/nixos/trunk/; revision=18866
2009-12-09 21:45:59 +00:00
Lluís Batlle i Rossell
b005e22952 Adding a not-very-nice option to allow setting the wpa_supplicant interface.
(eth1 in my PC, instead of the previously hardcoded wlan0)

svn path=/nixos/trunk/; revision=18862
2009-12-09 20:30:40 +00:00
Eelco Dolstra
38aeb2fdc8 svn path=/nixos/trunk/; revision=18860 2009-12-09 19:35:59 +00:00
Eelco Dolstra
f26080c5f4 * Clean up the nixos-rebuild output a bit.
svn path=/nixos/trunk/; revision=18859
2009-12-09 18:23:48 +00:00
Rob Vermaas
ed6d8c6881 due to new upstart version, vm tests didn't work anymore
svn path=/nixos/trunk/; revision=18840
2009-12-08 11:41:21 +00:00
Nicolas Pierron
82a891dc46 Add support for require attributes inside children configurations.
svn path=/nixos/trunk/; revision=18820
2009-12-05 19:21:57 +00:00
Nicolas Pierron
05c23802bb Fix synergy client.
* Add serverAddress option.
* Evaluate the client daemon in foreground, otherwise upstart get the hand
  and tries to restart it.

svn path=/nixos/trunk/; revision=18799
2009-12-04 12:50:49 +00:00
Nicolas Pierron
f4a6f9e84b * Add options to handle automatic calls to the garbage collector.
These options avoid manual references to pkgs.nixUnstable which might be
  changed with environment.nix option.

svn path=/nixos/trunk/; revision=18798
2009-12-04 12:50:44 +00:00
Eelco Dolstra
4eabed3f0f * Support short URLs (http://server/wiki/Page instead of
http://server/w/index.php?title=Page).

svn path=/nixos/trunk/; revision=18783
2009-12-03 13:34:36 +00:00
Eelco Dolstra
aacd16cff0 * Make various MediaWiki scripts available in $PATH,
e.g. mediawiki-<id>-changePassword (where <id> is usually "main").

svn path=/nixos/trunk/; revision=18780
2009-12-03 12:20:24 +00:00
Eelco Dolstra
9f8fc09fc3 * Create a user "mediawiki" and give root and wwwrun ident-based
access.

svn path=/nixos/trunk/; revision=18779
2009-12-03 11:56:03 +00:00
Eelco Dolstra
c7e0a7b31c * Make it configurable.
svn path=/nixos/trunk/; revision=18778
2009-12-03 08:44:54 +00:00
Eelco Dolstra
81c3454cdb * Allow Mediawiki (and other PHP applications) to send email through
the `sendmail' command (i.e. ssmtp).  This is hacky - there should
  be some global config value that specifies the path to sendmail,
  which the ssmtp module and others can then set.

svn path=/nixos/trunk/; revision=18777
2009-12-03 08:25:16 +00:00
Eelco Dolstra
f99d9b0658 * Basic MediaWiki module. Thanks to Dario Vodopivec, Milan Seneši and
Nasir Shadravan.

svn path=/nixos/trunk/; revision=18769
2009-12-02 17:59:17 +00:00
Eelco Dolstra
d29072d214 * Generate a postgresql.conf and use it to specify the paths to
pg_hba.conf and pg_ident.conf.
* Turn on syslog logging for PostgreSQL.

svn path=/nixos/trunk/; revision=18768
2009-12-02 17:18:25 +00:00
Marco Maggesi
729bf2e2f0 Fix wrong upstart directives in openafs-client
svn path=/nixos/trunk/; revision=18645
2009-11-26 14:12:19 +00:00
Marco Maggesi
7cefe762db Fix openafs-client for the new Upstart 0.6
svn path=/nixos/trunk/; revision=18644
2009-11-26 13:11:56 +00:00
Eelco Dolstra
8e8b3f9313 * Mount /var/run/nscd only once.
svn path=/nixos/branches/upstart-0.6/; revision=18607
2009-11-24 17:25:35 +00:00
Eelco Dolstra
ed6daf4ea4 * Doh! I lost ${flags} somewhere along the way, so Postgres
wouldn't get the -i option anymore...

svn path=/nixos/branches/upstart-0.6/; revision=18606
2009-11-24 17:07:23 +00:00
Eelco Dolstra
a21f18e81f * Synced with the trunk.
svn path=/nixos/branches/upstart-0.6/; revision=18602
2009-11-24 16:11:01 +00:00
Eelco Dolstra
e76f14714b svn path=/nixos/trunk/; revision=18599 2009-11-24 15:05:08 +00:00
Eelco Dolstra
88b26c47ad * Run cronjobs with a more userfriendly $PATH.
svn path=/nixos/trunk/; revision=18595
2009-11-24 14:20:33 +00:00
Sander van der Burg
ff177a01a7 Fixed ejabberd service so that it will be started on startup
svn path=/nixos/branches/upstart-0.6/; revision=18557
2009-11-23 13:29:47 +00:00
Sander van der Burg
7fc40ca2f1 Enabled startOn event of the MySQL and Tomcat server so that they are initialised on startup
svn path=/nixos/branches/upstart-0.6/; revision=18556
2009-11-23 13:26:33 +00:00
Michael Raskin
69a2842d01 Switch off one of the two conflicting on-by-default options
svn path=/nixos/trunk/; revision=18519
2009-11-22 14:34:53 +00:00
Ludovic Courtès
1966f9d297 Hopefully really fix the OpenSSH/GnuPG agent assertion (yes!).
svn path=/nixos/trunk/; revision=18517
2009-11-22 00:54:01 +00:00
Ludovic Courtès
d912b510f5 Hopefully really fix the OpenSSH/GnuPG agent assertion.
svn path=/nixos/trunk/; revision=18516
2009-11-22 00:46:37 +00:00
Ludovic Courtès
ab3332a2eb Rename startSSHAgent' to startOpenSSHAgent'.
svn path=/nixos/trunk/; revision=18515
2009-11-22 00:40:53 +00:00
Ludovic Courtès
8c349a9e71 Fix the OpenSSH/GnuPG agent assertion.
svn path=/nixos/trunk/; revision=18514
2009-11-22 00:40:48 +00:00
Ludovic Courtès
66d8af6d09 X: Add support for starting the GnuPG agent.
svn path=/nixos/trunk/; revision=18509
2009-11-21 22:14:01 +00:00
Sander van der Burg
2c8d2c2268 Small bugfix which automatically creates tomcat configuration dirs. Otherwise the startup would fail
svn path=/nixos/branches/upstart-0.6/; revision=18488
2009-11-20 16:20:57 +00:00
Sander van der Burg
ebbde6f8d3 Added directory option for ejabberd dumps so that we can use derivations on a convenient way, e.g. loadDumps = [ myDumpDrvFun ];
svn path=/nixos/branches/upstart-0.6/; revision=18487
2009-11-20 15:35:01 +00:00
Sander van der Burg
dd0f8b36d5 Moved ejabberd initialization check loop inside the if statement, since we only have to check for it in the first startup
svn path=/nixos/branches/upstart-0.6/; revision=18464
2009-11-19 15:17:04 +00:00
Sander van der Burg
9b000b3dcf Added loadDumps option, which makes it possible to load a specific ejabberd configuration on the first startup
svn path=/nixos/branches/upstart-0.6/; revision=18461
2009-11-19 15:12:05 +00:00
Sander van der Burg
a5cdfcbdb2 Removed the dirty sleep hack from the ejabberd service
svn path=/nixos/branches/upstart-0.6/; revision=18456
2009-11-19 13:15:15 +00:00
Sander van der Burg
e171b6d86e Added option to specify directories as a path for MySQL database schemas.
By using this approach we no longer have to specify schemas like this:

schema = "${myDatabaseSchemaDrvFun}/prefix/to/the/sqlfile.sql";

but like this:

schema = myDataBaseSchemaDrv;

which is in some cases more convenient.


svn path=/nixos/branches/upstart-0.6/; revision=18450
2009-11-18 21:56:47 +00:00
Sander van der Burg
27d0d2927e Added initialDatabases option to the MySQL service. This is useful for e.g. automatically intialing databases in a test VM
svn path=/nixos/branches/upstart-0.6/; revision=18437
2009-11-18 16:19:04 +00:00
Michael Raskin
ea2417ac87 Apply Eelco Dolstra's formatting suggestions
svn path=/nixos/trunk/; revision=18436
2009-11-18 15:11:54 +00:00
Michael Raskin
26f83d65e4 Adding GVPE service
svn path=/nixos/trunk/; revision=18431
2009-11-18 14:54:37 +00:00
Sander van der Burg
6d11d63ba3 Removed the nasty sleep hack of tomcat, since upstart-0,6 is also capable of only executing start and stop scripts
svn path=/nixos/branches/upstart-0.6/; revision=18430
2009-11-18 14:50:48 +00:00
Marco Maggesi
58b3476dfc Automatic download of CellServDB for OpenAFS client.
svn path=/nixos/trunk/; revision=18417
2009-11-18 13:28:16 +00:00
Eelco Dolstra
aa9d0a067e * Sync with the trunk.
svn path=/nixos/branches/upstart-0.6/; revision=18408
2009-11-18 11:50:06 +00:00
Michael Raskin
ddc5a7d7c5 Oops, placed mkIf in the wrong place. Fixing
svn path=/nixos/trunk/; revision=18402
2009-11-18 09:30:38 +00:00
Michael Raskin
a94da97354 Make monit actually switchable off
svn path=/nixos/trunk/; revision=18401
2009-11-18 09:29:43 +00:00
Michael Raskin
1a05efa66a Adding Monit - one more service to watch system..
svn path=/nixos/trunk/; revision=18399
2009-11-18 08:39:10 +00:00
Michael Raskin
f9958cbb44 Update kernel version for fresh-kernel
svn path=/nixos/trunk/; revision=18379
2009-11-17 09:00:49 +00:00
Eelco Dolstra
e9b2ef9fb7 * Restart wpa_supplicant and dhclient on resume.
svn path=/nixos/branches/upstart-0.6/; revision=18360
2009-11-15 20:40:41 +00:00
Eelco Dolstra
0755e228bf * Since "initctl stop" is now synchronous, the sleep is no longer
needed.

svn path=/nixos/branches/upstart-0.6/; revision=18359
2009-11-15 20:40:07 +00:00
Eelco Dolstra
56d817b0b0 * X server: remove the udev hack.
svn path=/nixos/branches/upstart-0.6/; revision=18358
2009-11-15 20:38:19 +00:00
Eelco Dolstra
9174b4ab42 * Provide a convience option for commands that must be executed both
when the system boots and when it resumes from suspend.

svn path=/nixos/branches/upstart-0.6/; revision=18354
2009-11-15 12:56:40 +00:00
Eelco Dolstra
1affc9168e * Move power management configuration into a separate module from
the acpid service.
* Add a pm-utils hook to allow commands to be executed when the system
  suspends/resumes etc.

svn path=/nixos/branches/upstart-0.6/; revision=18353
2009-11-15 12:48:42 +00:00
Eelco Dolstra
c1b008b4e3 * Don't build the Grub menu builder script on the ISO. Then we don't
the /init and /system symlinks on the CD (since it removes the
  cyclic dependency between building the Grub menu and the system
  derivation).

svn path=/nixos/branches/upstart-0.6/; revision=18344
2009-11-14 16:12:02 +00:00
Lluís Batlle i Rossell
e164ea4df8 Fixing bash syntax errors in the generations-dir builder.
svn path=/nixos/trunk/; revision=18342
2009-11-13 19:30:39 +00:00
Eelco Dolstra
7621b40d56 * Provide a 640x480 background image for GRUB 2.
* Turn on the graphical GRUB boot screen for the installation CD.

svn path=/nixos/branches/upstart-0.6/; revision=18340
2009-11-13 16:45:41 +00:00
Eelco Dolstra
091631b433 * Use Grub 2 on the installation CD. No graphics yet.
svn path=/nixos/branches/upstart-0.6/; revision=18325
2009-11-10 21:42:38 +00:00
Sander van der Burg
4af37a0994 VirtualBox Xorg driver needs xrefresh, so added it to the environment when using the virtualbox driver
svn path=/nixos/trunk/; revision=18322
2009-11-10 15:25:50 +00:00
Marco Maggesi
4bc162df4c Add configurations for package OpenAFS (added forgotten files)
svn path=/nixos/trunk/; revision=18321
2009-11-10 15:22:57 +00:00
Marco Maggesi
f9b44a7f0d Add configurations for package OpenAFS
svn path=/nixos/trunk/; revision=18320
2009-11-10 15:01:12 +00:00
Eelco Dolstra
d1bbe706a2 * Synced with the trunk.
svn path=/nixos/branches/upstart-0.6/; revision=18297
2009-11-08 21:27:53 +00:00
Lluís Batlle i Rossell
de1713a24f Failing when the top level system expression cannot find the kernel image
svn path=/nixos/trunk/; revision=18291
2009-11-08 18:32:21 +00:00
Lluís Batlle i Rossell
420639a4b1 Making generations-dir consider the pkgs.platform.
stdenv-updates stuff. Still to be reviewed, but at least an implementation to have
some different armv5tel-linux platforms: qemu versatile and the sheevaplug.


svn path=/nixos/trunk/; revision=18290
2009-11-08 17:38:35 +00:00
Nicolas Pierron
616c844336 * Move the default value of videoDrivers into the default field of the
option.  Otherwise, the system may depends on unused/unsupported
  softwares and users will be force to use properties in their
  configuration.nix file to override this default value. (too complex for
  new users)

svn path=/nixos/trunk/; revision=18288
2009-11-08 16:01:22 +00:00
Eelco Dolstra
37470cccc5 * Blacklist the "evbug" module.
svn path=/nixos/trunk/; revision=18285
2009-11-08 09:08:50 +00:00
Eelco Dolstra
16c2aa734f * Generate /etc/modprobe.conf to allow the setting of module options
and the blacklisting of modules.

svn path=/nixos/trunk/; revision=18284
2009-11-08 09:01:53 +00:00
Wouter den Breejen
b0ba17873c Fixed hash replace with a variable to the real hash
svn path=/nixos/trunk/; revision=18268
2009-11-07 21:03:57 +00:00
Eelco Dolstra
9bf8801dc6 * Use a tmpfs for /var/run/nscd to ensure that / or /var can be
unmounted or at least remounted read-only during shutdown.  Upstart
  0.6 apparently uses nscd to do some name lookups, resulting in it
  holding some mmap mappings to deleted files in /var/run/nscd.
  E.g. lsof shows:

    init         1 root  DEL       REG              253,0          1850313 /var/run/nscd/dbyn3Piz
    init         1 root  DEL       REG              253,0          1850312 /var/run/nscd/dbt2e8PH

  See also http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=324900.
  This is a workaround - it would be better if Upstart didn't do this.

svn path=/nixos/branches/upstart-0.6/; revision=18258
2009-11-07 15:29:46 +00:00
Eelco Dolstra
2353e53c5f * /var/run/safemode isn't used anywhere.
svn path=/nixos/branches/upstart-0.6/; revision=18257
2009-11-07 15:24:59 +00:00
Eelco Dolstra
d9d072a89b * Improve the mysql shutdown.
svn path=/nixos/branches/upstart-0.6/; revision=18255
2009-11-07 12:43:32 +00:00
Eelco Dolstra
7aecd0ca53 * hal: depend on both dbus and acpid (if enabled).
* dbus: don't signal Upstart, since that seems to make it forget about
  pending events or something.  In any case starting dbus after acpid
  was running wouldn't trigger hal to be started (but the other way
  around did work).

svn path=/nixos/branches/upstart-0.6/; revision=18251
2009-11-07 12:01:12 +00:00
Eelco Dolstra
7d47575a58 * A 15-second timeout to start the X server is too low if there are a
billion other daemons starting at the same time during the boot.

svn path=/nixos/branches/upstart-0.6/; revision=18250
2009-11-07 11:32:28 +00:00
Eelco Dolstra
b7c519456e * Updated switch-to-configuration for Upstart 0.6.
svn path=/nixos/branches/upstart-0.6/; revision=18237
2009-11-07 01:17:56 +00:00
Eelco Dolstra
06fcb121fb * Shut down PostgreSQL cleanly.
svn path=/nixos/branches/upstart-0.6/; revision=18236
2009-11-06 23:37:31 +00:00
Eelco Dolstra
18f2d75275 * Set a timezone in the PostgreSQL job. Otherwise database
initialisation will be incredibly slow (minutes instead of
  seconds).  An strace shows that it's continuously looking up
  timezone information if TZ is empty.

svn path=/nixos/branches/upstart-0.6/; revision=18235
2009-11-06 22:56:47 +00:00
Eelco Dolstra
d7342c78d4 * Support pre-stop scripts. These are needed to cleanly shutdown
daemons such as Apache or PostgreSQL.

svn path=/nixos/branches/upstart-0.6/; revision=18234
2009-11-06 22:45:19 +00:00
Eelco Dolstra
83a9bf9a6a * Change all the startOn / stopOn attributes to the Upstart 0.6 syntax
(e.g., startOn = "started foo" instead of startOn = "foo").

svn path=/nixos/branches/upstart-0.6/; revision=18230
2009-11-06 22:19:17 +00:00
Eelco Dolstra
6b0842ff52 svn path=/nixos/branches/upstart-0.6/; revision=18229 2009-11-06 21:51:28 +00:00
Eelco Dolstra
a60d83d3b4 svn path=/nixos/branches/upstart-0.6/; revision=18228 2009-11-06 21:39:18 +00:00
Eelco Dolstra
d545d08461 * In the network-interfaces task, emit an ip-up event if there is a
statically configured interface (i.e. we're not running dhclient).
  Otherwise the ntpd job won't be triggered.
* Use the "-n" flag of "initctl emit" to send the event
  asynchronously.

svn path=/nixos/branches/upstart-0.6/; revision=18227
2009-11-06 21:38:40 +00:00
Eelco Dolstra
4b2ff53ec6 * Don't stop jobs that are already stopped.
svn path=/nixos/branches/upstart-0.6/; revision=18226
2009-11-06 21:17:11 +00:00
Eelco Dolstra
82c3e2aa50 * Updated poweroff/reboot/maintenance mode for Upstart 0.6. Upstart
no longer emits specific events for those.  Instead it emits a
  "runlevel" event.  The "runlevel" task starts the "shutdown" task to
  perform the desired action.
* Upstart 0.6 no longer has a "shutdown" event, so "stop on shutdown"
  no longer works.  Therefore the shutdown task explicitly stops all
  running Upstart jobs, before sending a TERM/KILL signal to all
  remaining processes.
* Do a "chvt 1" at the start of the shutdown task to switch to the
  console.
* Use /dev/console instead of /dev/tty1, since if somebody is logged
  in on tty1, bad things will happen.

svn path=/nixos/branches/upstart-0.6/; revision=18224
2009-11-06 21:08:06 +00:00
Eelco Dolstra
676da4d87d * Updated some more jobs.
svn path=/nixos/branches/upstart-0.6/; revision=18219
2009-11-06 19:20:09 +00:00
Eelco Dolstra
3fcb7c2cb5 * Set the nameserver.
svn path=/nixos/branches/upstart-0.6/; revision=18218
2009-11-06 19:19:46 +00:00
Eelco Dolstra
c0f732f079 * Work around a lack of laziness in the xserver.nix module.
svn path=/nixos/trunk/; revision=18216
2009-11-06 16:30:48 +00:00
Nicolas Pierron
e07f1e98db * Revert 18115, 18150, 18135, 18112, 18107-18105.
Revert modifications done on apache-httpd configurations.


svn path=/nixos/trunk/; revision=18215
2009-11-06 16:23:25 +00:00
Eelco Dolstra
b9bfe7ed43 * Connect Upstart to the system bus.
svn path=/nixos/branches/upstart-0.6/; revision=18213
2009-11-06 15:59:23 +00:00
Eelco Dolstra
9fa2f12cc2 * Do some more jobs.
svn path=/nixos/branches/upstart-0.6/; revision=18212
2009-11-06 15:46:56 +00:00
Eelco Dolstra
903e92bde6 * Use Upstart's "export fork" feature to properly detect when a daemon
is "ready".  This prevents ugly race conditions, e.g. HAL failing to
  start because dbus hasn't finished starting yet.
* Support post-start scripts.  These are executed after the job's main
  process has started but before the job's "started" event is
  emitted.  For instance, the udev job uses this to perform "udevadm
  trigger / settle" to create all devices.  Previously this had to be
  done in the pre-start script, so the daemon had to started in the
  pre-start script as well.

svn path=/nixos/branches/upstart-0.6/; revision=18211
2009-11-06 15:23:16 +00:00
Marco Maggesi
ae23b68ee8 Add configurations for MIT kerberos.
svn path=/nixos/trunk/; revision=18203
2009-11-06 12:58:44 +00:00
Eelco Dolstra
5d240b99d5 * Work around a bug in HAL (it fails to start if $PATH is too long,
since it uses a 512-byte buffer somewhere).

svn path=/nixos/branches/upstart-0.6/; revision=18198
2009-11-06 11:31:57 +00:00
Eelco Dolstra
7011a9315f * Use Upstart 0.6. Jobs are now in /etc/init instead of /etc/event.d.
svn path=/nixos/branches/upstart-0.6/; revision=18192
2009-11-06 10:43:38 +00:00
Eelco Dolstra
b581a56d79 * Define the Upstart package to use in one place.
svn path=/nixos/branches/upstart-0.6/; revision=18187
2009-11-06 09:36:35 +00:00
Eelco Dolstra
5fc4590ce5 * Fix indentation.
svn path=/nixos/branches/upstart-0.6/; revision=18186
2009-11-06 09:26:36 +00:00
Eelco Dolstra
124096e418 * Remember the original symbolic driver name.
svn path=/nixos/trunk/; revision=18185
2009-11-06 09:22:00 +00:00
Eelco Dolstra
3e9665dd96 * X server autoconfiguration. Rather than specifying a fixed video
driver (in services.xserver.videoDriver), the X server is now given
  a set of drivers, and will use PCI ids to find the right one.

  The only problem is that the choice of OpenGL driver (the
  /var/run/opengl-driver symlink) depends on what driver is selected
  at runtime (i.e. the NVIDIA implementation for "nvidia", and Mesa
  for all other drivers).  However this isn't a big problem right now
  since "nvidia" isn't included in the default set of drivers anyway
  for legal reasons.
  
* `services.xserver.resolutions' now defaults to [], meaning that the
  X server should figure out the desired resolution(s) itself.
  Likewise, `services.xserver.defaultDepth' defaults to 0 to let the X
  server figure it out.

* Removed some options from xorg.conf that no longer appear needed
  ("Composite" and the DRI "Mode").

svn path=/nixos/trunk/; revision=18176
2009-11-06 00:59:03 +00:00
Lluís Batlle i Rossell
fe1f084728 Adding a new xorg driver: unichrome
svn path=/nixos/trunk/; revision=18163
2009-11-05 21:35:36 +00:00
Nicolas Pierron
72f804c9b2 * Fix subversion test and change the name of the "config" option to
"configuration" because it may interfered with sub-modules keywords.

svn path=/nixos/trunk/; revision=18155
2009-11-05 19:24:02 +00:00
Nicolas Pierron
7571055ad3 * Declare options for sub-services.
* Add deprecated options for "serviceType", "serviceName", "function" and
  "config" without changing the behavior.

svn path=/nixos/trunk/; revision=18150
2009-11-05 18:21:03 +00:00
Nicolas Pierron
1952365a51 * Remove unused subservice syntax.
svn path=/nixos/trunk/; revision=18135
2009-11-05 13:34:01 +00:00
Eelco Dolstra
ad17a6dce3 * Changes related to the xorg-7.5 merge.
svn path=/nixos/trunk/; revision=18126
2009-11-04 22:44:40 +00:00
Eelco Dolstra
3f7eb694a9 * CUPS provides a dbus service.
svn path=/nixos/trunk/; revision=18125
2009-11-04 22:44:21 +00:00
Nicolas Pierron
8734b7103e * Remove needs to call getPort to access the server port. This is made
possible by using sub-modules arguments.

svn path=/nixos/trunk/; revision=18112
2009-11-04 18:14:42 +00:00
Nicolas Pierron
0e22df1587 * Use sub-modules for httpd virtual hosts. This add documentation entries
and allow non-intrusive extensions of virtual hosts.

svn path=/nixos/trunk/; revision=18107
2009-11-04 17:00:53 +00:00
Nicolas Pierron
ff1d9969fb * re-indent per-server-options.nix content.
svn path=/nixos/trunk/; revision=18106
2009-11-04 17:00:48 +00:00
Nicolas Pierron
063224bc84 * Convert per-server-options into a module.
svn path=/nixos/trunk/; revision=18105
2009-11-04 17:00:42 +00:00