Commit graph

805 commits

Author SHA1 Message Date
Eelco Dolstra
ffd96f07fe svn path=/nixos/trunk/; revision=10689 2008-02-14 14:29:21 +00:00
Eelco Dolstra
b9d01830d3 * In a vhost, merge in the robots.txt for the main server.
svn path=/nixos/trunk/; revision=10688
2008-02-14 14:14:39 +00:00
Eelco Dolstra
44fceb9c4d svn path=/nixos/trunk/; revision=10686 2008-02-14 13:37:09 +00:00
Eelco Dolstra
94937ba2aa * Support for declaring virtual hosts, like
httpd = {
      ...
      virtualHosts = [
        { hostName = "foo";
          documentRoot = "/data/webroot-foo";
          ...
        }
        { hostName = "bar";
          documentRoot = "/data/webroot-bar";
          ...
        }
      ];
    };

  Each virtual host can specify almost any option also permitted in
  the top-level httpd configuration.

svn path=/nixos/trunk/; revision=10682
2008-02-14 13:20:26 +00:00
Ludovic Courtès
bfbe92236a Remove remaining `abort ()'.
svn path=/nixos/trunk/; revision=10680
2008-02-14 11:44:54 +00:00
Ludovic Courtès
bdc729ea6c Use assert (!C)' instead of if (C) abort ();' in setuid wrappers.
svn path=/nixos/trunk/; revision=10679
2008-02-14 11:08:06 +00:00
Eelco Dolstra
a05d842575 * Close fdSelf.
svn path=/nixos/trunk/; revision=10678
2008-02-14 10:56:14 +00:00
Eelco Dolstra
f6fce91cb2 * Allow httpd subservices to declare options locally.
* Allow multiple instantiations of a subservice (for instance,
  multiple Subversion subservices in the same Apache server).

svn path=/nixos/trunk/; revision=10675
2008-02-14 09:54:25 +00:00
Ludovic Courtès
33f34e2092 Don't define ASPELL_EXTRA_DICT_DIRS', use ASPELL_CONF' instead.
svn path=/nixos/trunk/; revision=10673
2008-02-14 09:41:34 +00:00
Eelco Dolstra
18123c08ca * Refactoring.
svn path=/nixos/trunk/; revision=10671
2008-02-14 07:42:52 +00:00
Eelco Dolstra
6e06b11097 svn path=/nixos/trunk/; revision=10643 2008-02-12 12:56:39 +00:00
Eelco Dolstra
eca9242918 svn path=/nixos/trunk/; revision=10624 2008-02-11 11:51:51 +00:00
Eelco Dolstra
666d0bde09 * Disable modules missing on x86_64.
svn path=/nixos/trunk/; revision=10563
2008-02-08 23:51:43 +00:00
Eelco Dolstra
0efc29afa4 * Manual updates.
svn path=/nixos/trunk/; revision=10560
2008-02-08 22:43:59 +00:00
Michael Raskin
c21ba2d99e Created expression to keep in sync with rescue-cd.nix; I do not want to make creating smaller CD images more difficult.
svn path=/nixos/trunk/; revision=10559
2008-02-08 19:31:41 +00:00
Michael Raskin
067db8fa72 Modifications to nixos-checkout for multi-branch support.
svn path=/nixos/trunk/; revision=10558
2008-02-08 19:13:29 +00:00
Eelco Dolstra
ce250ffb37 * Installation CD: include a lot of modules (SATA, PATA, Firewire,
USB, some SCSI controllers) in the initrd for mounting the CD.
* Add nix-hardware-scan to the system.
* Upstart: don't use the -v flag.
* Include the NixOS version in the ISO image filename.
* Include testdisk and ms-sys in the CD.
* Some bugfixes in the installer.

svn path=/nixos/trunk/; revision=10556
2008-02-08 15:59:15 +00:00
Eelco Dolstra
1f81bcae40 svn path=/nixos/trunk/; revision=10548 2008-02-07 14:39:32 +00:00
Eelco Dolstra
b510189674 svn path=/nixos/trunk/; revision=10545 2008-02-07 14:15:13 +00:00
Sander van der Burg
390d2adb91 Modified variable names to follow the standard convention
svn path=/nixos/trunk/; revision=10544
2008-02-07 14:02:38 +00:00
Sander van der Burg
7fad8dc1b9 Changed some variable names to follow the standard convention
svn path=/nixos/trunk/; revision=10542
2008-02-07 13:37:20 +00:00
Sander van der Burg
76897682c4 Added vsftpd upstart job
svn path=/nixos/trunk/; revision=10540
2008-02-07 12:41:18 +00:00
Eelco Dolstra
8bf1cade68 * New-style Subversion server configuration.
svn path=/nixos/trunk/; revision=10508
2008-02-05 16:25:07 +00:00
Eelco Dolstra
65c1f9882c * Less verbosity.
svn path=/nixos/trunk/; revision=10506
2008-02-05 14:33:21 +00:00
Sander van der Burg
90f34e204d Added ejabberd service
svn path=/nixos/trunk/; revision=10495
2008-02-04 13:40:01 +00:00
Eelco Dolstra
707e515f82 * Option to enable support for the WIS GO7007.
svn path=/nixos/trunk/; revision=10491
2008-02-04 10:52:58 +00:00
Eelco Dolstra
c30e7b0f13 * Determine networking.enableIntel3945ABGFirmware.
svn path=/nixos/trunk/; revision=10490
2008-02-04 10:39:06 +00:00
Eelco Dolstra
57a01e7733 * Prevent warnings about existing directories.
svn path=/nixos/trunk/; revision=10489
2008-02-04 10:20:38 +00:00
Eelco Dolstra
9802ed58ee * hardware-scan: load modules for all supported USB devices
automatically.  Of course this should be triggered when
  a USB device is plugged in (from udev).

svn path=/nixos/trunk/; revision=10451
2008-02-01 21:50:29 +00:00
Eelco Dolstra
b078ef6c70 * Cron: set TZ.
svn path=/nixos/trunk/; revision=10449
2008-02-01 13:56:36 +00:00
Eelco Dolstra
0d50031a0a * Periodically update the locate database from cron when
config.services.locate.enable is set.

svn path=/nixos/trunk/; revision=10448
2008-02-01 12:35:51 +00:00
Eelco Dolstra
9f62e1a6a5 * Declarative specification of the system cron jobs. Ideally
this would abstract over the Crontab syntax though.

svn path=/nixos/trunk/; revision=10447
2008-02-01 12:01:27 +00:00
Eelco Dolstra
7521d6c49a * Add the Intel 82G965.
svn path=/nixos/trunk/; revision=10410
2008-01-30 14:57:13 +00:00
Eelco Dolstra
8ea2ce37c8 * NVIDIA support.
svn path=/nixos/trunk/; revision=10409
2008-01-30 14:53:06 +00:00
Eelco Dolstra
8e94f3ad67 * First attempt at detecting services.xserver.videoDriver.
svn path=/nixos/trunk/; revision=10408
2008-01-30 14:50:25 +00:00
Sander van der Burg
406d3aafc5 Added deploydir to tomcat service
svn path=/nixos/trunk/; revision=10407
2008-01-30 14:38:27 +00:00
Eelco Dolstra
92fffa1ee8 * Detect the networking.enableIntel2200BGFirmware option.
svn path=/nixos/trunk/; revision=10406
2008-01-30 14:32:02 +00:00
Eelco Dolstra
7363895f6d * Rewrote the hardware scanner in Perl.
svn path=/nixos/trunk/; revision=10405
2008-01-30 14:16:38 +00:00
Sander van der Burg
c1f619a087 Added tomcat service to NixOS
svn path=/nixos/trunk/; revision=10403
2008-01-30 11:00:59 +00:00
Sander van der Burg
b3ff0f8a59 Added tomcat service to NixOS
svn path=/nixos/trunk/; revision=10402
2008-01-30 11:00:00 +00:00
Michael Raskin
b8cc335fbb Reformatted rescue-cd-configurable.nix
svn path=/nixos/trunk/; revision=10401
2008-01-30 09:42:48 +00:00
Eelco Dolstra
9fd5d70968 * The CD is now a true live CD: you can run Nix operations in it
thanks to unionfs.  For instance, nix-env and nixos-rebuild work.
  The tricky part was to build a Nix database (in the tmpfs/unionfs)
  which is now necessary to prevent store paths on the CD from being
  deleted right away because they otherwise wouldn't be valid.
  
* nixos-install: use the /etc/nixos/configuration.nix from the target
  file system (don't copy it anymore).  Since the user is supposed to
  mount the target file system on /mnt anyway, we may as well require
  that configuration.nix is placed in /mnt/etc/nixos.  This also makes
  upgrading / reinstalling much easier, since it will automatically
  use the right configuration.nix.

svn path=/nixos/trunk/; revision=10399
2008-01-30 01:28:56 +00:00
Eelco Dolstra
34e63da53b * Make nixUnstable the default again.
svn path=/nixos/trunk/; revision=10398
2008-01-30 01:14:03 +00:00
Michael Raskin
76a6498196 Catching up with rescue-cd.nix
svn path=/nixos/trunk/; revision=10391
2008-01-29 22:37:24 +00:00
Eelco Dolstra
2da50038e4 * Use aufs instead of unionfs, it seems to be more stable.
svn path=/nixos/trunk/; revision=10390
2008-01-29 18:53:15 +00:00
Michael Raskin
6f0772d9f0 JBoss job fix
svn path=/nixos/trunk/; revision=10367
2008-01-28 20:04:48 +00:00
Sander van der Burg
6e96e0a87d Fixed syntax error
svn path=/nixos/trunk/; revision=10311
2008-01-28 15:44:59 +00:00
Sander van der Burg
1727c4bd3b Added mod_jk module to apache httpd
svn path=/nixos/trunk/; revision=10310
2008-01-28 15:40:29 +00:00
Sander van der Burg
8d5884e01f Added JBoss service
svn path=/nixos/trunk/; revision=10309
2008-01-28 15:16:14 +00:00
Sander van der Burg
4341ef80d8 Fixed MySQL option
svn path=/nixos/trunk/; revision=10307
2008-01-28 14:55:12 +00:00