philipp/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Activity
%!d() commits 3 branches 0 tags 1.4 GiB
Commit graph

245 commits

Author SHA1 Message Date
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 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
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
Eelco Dolstra 18123c08ca * Refactoring. 
svn path=/nixos/trunk/; revision=10671
 2008-02-14 07:42:52 +00:00
Eelco Dolstra 0efc29afa4 * Manual updates. 
svn path=/nixos/trunk/; revision=10560
 2008-02-08 22:43:59 +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 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 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
Sander van der Burg 406d3aafc5 Added deploydir to tomcat service 
svn path=/nixos/trunk/; revision=10407
 2008-01-30 14:38:27 +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
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
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
Sander van der Burg a73c26875a Added MySQL service to NixOS 
svn path=/nixos/trunk/; revision=10305
 2008-01-28 14:30:18 +00:00
Michael Raskin e5025996ca fontDir compatible with both trunk and (hopefully) stdenv-updates 
svn path=/nixos/trunk/; revision=10293
 2008-01-25 13:31:59 +00:00
Yury G. Kudryashov e914d28638 Using default stdenv in fontdir.nix 
svn path=/nixos/trunk/; revision=10289
 2008-01-25 12:54:32 +00:00
Yury G. Kudryashov 3166d9f687 Made iwlwifi optional, with false default 
svn path=/nixos/trunk/; revision=10288
 2008-01-25 12:54:27 +00:00
Eelco Dolstra 49e8829053 * Use unionfs to provide a real Live CD, i.e., the files on the CD 
appear writable (though all writes go to a tmpfs).  This allows you
  to run Nix operations on the Live CD.  However, we're not quite
  there yet since the CD doesn't have a valid Nix database.  So for
  instance a garbage collect will cause everything to be deleted,
  hanging the system.

svn path=/nixos/trunk/; revision=10276
 2008-01-24 16:56:09 +00:00
Michael Raskin 7fa31be440 Tried to do offline install CD, not DVD. Failure, but some parts could be useful. 
svn path=/nixos/trunk/; revision=10248
 2008-01-22 17:55:57 +00:00
Eelco Dolstra 86484779c7 * Mount usbfs on /proc/bus/usb. 
svn path=/nixos/trunk/; revision=10220
 2008-01-18 15:18:32 +00:00
Andres Löh 563a6240a3 * updated docs to reflect new xmonad choice 
svn path=/nixos/trunk/; revision=10181
 2008-01-16 16:53:32 +00:00
Eelco Dolstra d9ffa7f72e * Manual bug. 
svn path=/nixos/trunk/; revision=10179
 2008-01-16 15:33:09 +00:00
Michael Raskin d69cc82771 Moved configuration check option into configuration.nix (environment.checkConfigurationOptions) 
svn path=/nixos/trunk/; revision=10157
 2008-01-15 16:05:51 +00:00
Eelco Dolstra 26e0f711a9 * Use the aggregator to combine the kernel modules tree with 
externally-built modules so that (e.g.) "modprobe nvidia" Just
  Works.

svn path=/nixos/trunk/; revision=10129
 2008-01-12 23:37:17 +00:00
Eelco Dolstra cfed953b5f * Option to enable the Intel 3945 firmware. (It's enabled by 
default since it doesn't seem to have the legal issues of
  the Intel 2200 firmware.)
* Firmware loader: don't write in /tmp.  Also a hack to quickly
  test new firmwares.
* Revert r10105 since the build fails if configuration.nix 
  is a symlink.  Anyway copying configuration.nix does not
  necessarily make sense since it can import other expressions,
  which would also have to be copied.  Perhaps a better 
  approach would be to write a serialisation of the config
  to a file (maybe with builtins.toXML).

svn path=/nixos/trunk/; revision=10127
 2008-01-12 22:53:13 +00:00
Michael Raskin 4475a74fb8 LiveDVD with X and sources made. 
svn path=/nixos/trunk/; revision=10119
 2008-01-11 16:59:39 +00:00
Michael Raskin a11779f912 Gw6c now can be configured not to start automatically 
svn path=/nixos/trunk/; revision=10116
 2008-01-11 06:36:15 +00:00
Michael Raskin 99a2f550c0 Modifications to grub-menu-builder: copy default kernel and initrd to /boot/nixos-.. , limit menu size 
svn path=/nixos/trunk/; revision=10106
 2008-01-10 04:43:19 +00:00
Michael Raskin f667e94752 Now configuration.nix is copied into shared. 
svn path=/nixos/trunk/; revision=10105
 2008-01-09 16:08:15 +00:00
Eelco Dolstra fec916552c * Add $prefix/info, set $INFOPATH. 
svn path=/nixos/trunk/; revision=10087
 2008-01-07 11:46:17 +00:00
Eelco Dolstra a00f463ffa * Symlink /man in /var/run/current-system/sw so that for 
example "man bash" works.  Ideally of course all packages
  should put their man pages under $out/share/man.

svn path=/nixos/trunk/; revision=10086
 2008-01-07 11:24:02 +00:00
Michael Raskin 5a29acf6a0 Added module aggregation, also changed non-root shell prompt colour to green 
svn path=/nixos/trunk/; revision=10084
 2008-01-06 18:45:13 +00:00
Eelco Dolstra 9e00dfe107 * Add a bunch of common SATA modules to the default initrd. 
svn path=/nixos/trunk/; revision=10083
 2008-01-06 00:51:07 +00:00
Eelco Dolstra 56107c81b0 * Put some help text in /etc/issue on the CD. 
svn path=/nixos/trunk/; revision=10076
 2008-01-04 17:05:48 +00:00
Eelco Dolstra 3abf5072ce * Installation CD: start a web browser showing the NixOS manual on 
tty7.
* Add w3m to the installation CD's path since it's needed for the
  manual anyway.

svn path=/nixos/trunk/; revision=10074
 2008-01-04 16:11:12 +00:00
Eelco Dolstra f4399a1883 * Option to set the Grub background image. To 
get the background image to work, you may need
  to set NIXOS_INSTALL_GRUB=1 when calling
  nixos-rebuild to force Grub to be reinstalled
  with splashimage support.

svn path=/nixos/trunk/; revision=10071
 2008-01-04 15:02:31 +00:00