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

535 commits

Author SHA1 Message Date
Eelco Dolstra 5d2435d460 * Top-level redirect to the repoman. 
svn path=/nixos/trunk/; revision=10758
 2008-02-19 16:52:24 +00:00
Eelco Dolstra 20881fe84b * Indentation. 
svn path=/nixos/trunk/; revision=10757
 2008-02-19 16:52:08 +00:00
Eelco Dolstra a2c20a9d29 * Virtual hosts: inherit adminAddr from the main server. 
svn path=/nixos/trunk/; revision=10756
 2008-02-19 14:54:19 +00:00
Eelco Dolstra d7dd9179ce * Allow aliases for each virtual host. 
svn path=/nixos/trunk/; revision=10754
 2008-02-19 14:41:20 +00:00
Ludovic Courtès 5122633592 Add support for Intel's 4965AGN firmware. 
svn path=/nixos/trunk/; revision=10735
 2008-02-18 16:50:08 +00:00
Eelco Dolstra bbbef0f2fa * extraDirectores -> extraConfig. 
svn path=/nixos/trunk/; revision=10731
 2008-02-18 15:00:26 +00:00
Eelco Dolstra 8a1d362447 * Postgres job: start postgres directly, don't use the old control 
script from the services tree.

svn path=/nixos/trunk/; revision=10722
 2008-02-18 11:56:43 +00:00
Ludovic Courtès b98cb9a770 Add BitlBee Upstart job in deamon mode. 
svn path=/nixos/trunk/; revision=10720
 2008-02-18 09:15:10 +00:00
Eelco Dolstra a9281eae63 * Put the static files for the Subversion service in a separate directory. 
svn path=/nixos/trunk/; revision=10697
 2008-02-14 20:59:04 +00:00
Eelco Dolstra 7563d6e144 svn path=/nixos/trunk/; revision=10693 2008-02-14 20:14:57 +00:00
Eelco Dolstra a06b51f895 svn path=/nixos/trunk/; revision=10692 2008-02-14 19:47:17 +00:00
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
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 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
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
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 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
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 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
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 f38ed802a6 Added MySQL to NixOS 
svn path=/nixos/trunk/; revision=10306
 2008-01-28 14:34:29 +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 01004362f2 Now xfs job fails without enableFontDir. 
svn path=/nixos/trunk/; revision=10279
 2008-01-24 21:35:24 +00:00
Yury G. Kudryashov 8f503d7302 typo in upstart-jobs/xfs.nix fixed 
svn path=/nixos/trunk/; revision=10278
 2008-01-24 20:37:27 +00:00
Michael Raskin 7749d93524 Added extraInitrdKernelModules option to CD 
svn path=/nixos/trunk/; revision=10182
 2008-01-16 21:56:31 +00:00
Andres Löh e893328176 * added xmonad to possible windowManager choices in xserver.nix 
svn path=/nixos/trunk/; revision=10180
 2008-01-16 16:49:22 +00:00
Eelco Dolstra d9ffa7f72e * Manual bug. 
svn path=/nixos/trunk/; revision=10179
 2008-01-16 15:33:09 +00:00
Eelco Dolstra 622734b58b * Generate /etc/ssh/ssh_config, set ForwardX11 and XAuthLocation. 
svn path=/nixos/trunk/; revision=10177
 2008-01-16 13:59:03 +00:00
Michael Raskin e8ddb6fd2d Samba service; httpd/xfs dependencies changed to know about gw6c.autorun option. 
svn path=/nixos/trunk/; revision=10140
 2008-01-14 11:24:36 +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 a4ff40b158 Added kqemu 0666 permissions 
svn path=/nixos/trunk/; revision=10097
 2008-01-08 00:16:49 +00:00
Eelco Dolstra a2c1282ebc * Get rid of some unnecessary xorg.conf statements. 
svn path=/nixos/trunk/; revision=10096
 2008-01-07 23:12:02 +00:00
Eelco Dolstra c71e8dc314 * Load the NVIDIA kernel module automatically and some more cleanups. 
svn path=/nixos/trunk/; revision=10095
 2008-01-07 22:56:16 +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 8f0e88d4e5 * Just pass all of Nixpkgs to xserver.nix. 
svn path=/nixos/trunk/; revision=10068
 2008-01-04 10:54:33 +00:00
Eelco Dolstra b73424833a * xserver.nix: remove some unnecessary function arguments. 
* isClone: changed into a boolean rather than a string "on" or "off".

svn path=/nixos/trunk/; revision=10067
 2008-01-04 10:36:14 +00:00
Eelco Dolstra 48142d8135 * Use the '' string syntax, it cleans up xserver.nix a lot. 
svn path=/nixos/trunk/; revision=10066
 2008-01-04 10:28:12 +00:00
Eelco Dolstra 3da504ab6a * Disable mod_unique_id because it fails when the machine doesn't have 
an IP address yet.
* Create /var/run/httpd, /var/log/httpd automatically.

svn path=/nixos/trunk/; revision=10064
 2008-01-03 17:11:36 +00:00
Marc Weber 598848d6af patches provided by Tobias Hammerschmidt 
svn path=/nixos/trunk/; revision=10055
 2008-01-02 21:16:58 +00:00
Michael Raskin 27d5e93920 Added choice of sound devices mode. 
svn path=/nixos/trunk/; revision=10045
 2008-01-02 10:07:52 +00:00
Michael Raskin 55b977dcbf Changes to xserver to export configuration and to allow not to run the job on boot, changes to filesystems job to autocreate some mountpoints (/dev/shm..) 
svn path=/nixos/trunk/; revision=9987
 2007-12-31 08:55:40 +00:00
Michael Raskin b3fa4f1e4e Added some xfs and general font changes. 
svn path=/nixos/trunk/; revision=9966
 2007-12-25 12:16:38 +00:00
Michael Raskin 4892139b38 Added ATI card support to xserver.conf 
svn path=/nixos/trunk/; revision=9951
 2007-12-18 22:43:17 +00:00
Eelco Dolstra 4ef15fc095 * Statically check whether the generated httpd.conf is correct. 
* Option `noUserDir' -> `enableUserDir', negatives are bad :-)

svn path=/nixos/trunk/; revision=9927
 2007-12-12 15:30:17 +00:00
Eelco Dolstra 6f5da72337 * Start of a nicer Apache configuration than the old stuff in the 
services tree.  This one does the generation of httpd.conf in
  the Nix expression language instead of in a builder.

svn path=/nixos/trunk/; revision=9926
 2007-12-12 13:58:15 +00:00
Michael Raskin 3ba09e4004 Changed Postgresql upstart job not to stop on network down 
svn path=/nixos/trunk/; revision=9867
 2007-12-06 03:50:15 +00:00
Eelco Dolstra d987b16112 * More declarative specification of the DHCPD config. 
svn path=/nixos/trunk/; revision=9856
 2007-12-04 14:53:37 +00:00
Michael Raskin aeced64d0e Added PostgreSQL job. 
svn path=/nixos/trunk/; revision=9830
 2007-12-03 04:48:31 +00:00
Eelco Dolstra 9dd7891820 * Options for configuring the (mail) domain. 
svn path=/nixos/trunk/; revision=9785
 2007-11-23 17:12:37 +00:00
Eelco Dolstra e7e685e4ce * Allow Upstart jobs to declare extra configuration for Apache. 
Did this for Nagios.  Soon we can rename upstart-jobs to 
  services/plugins/whatever (i.e. an Upstart job will just be 
  one kind of configuration item that a plugin can declare).

svn path=/nixos/trunk/; revision=9778
 2007-11-23 10:56:12 +00:00
Eelco Dolstra 524f1fa376 svn path=/nixos/trunk/; revision=9756 2007-11-19 15:50:26 +00:00
Eelco Dolstra 4de273e376 * Set the To: field. 
* Doh! copy the actual Nagios config files to the store, 
  not symlinks to the sources outside of the store.

svn path=/nixos/trunk/; revision=9755
 2007-11-19 15:50:02 +00:00
Eelco Dolstra d53c726cbb * Make the Nagios configuration visible in /etc/nagios.cfg. 
svn path=/nixos/trunk/; revision=9753
 2007-11-19 15:31:28 +00:00
Marc Weber bb08b8ff48 ; bug fix 
svn path=/nixos/trunk/; revision=9701
 2007-11-15 23:57:20 +00:00
Marc Weber d7eb1006bb added driver nv as suggested by niksnut 
svn path=/nixos/trunk/; revision=9700
 2007-11-15 23:52:53 +00:00
Eelco Dolstra f6fd10cbd8 * Support for system-wide distributed / multi-platform builds. 
Just set nix.distributedBuilds to true and nix.buildMachines 
  to a list of machines that can perform Nix builds via SSH,
  and local builds will be forwarded appropriately.  So now
  any user can say something like

    nix-build /etc/nixos/nixpkgs/ --arg system '"powerpc-linux"' -A libxml2

  and the build for powerpc-linux will be forwarded to a machine 
  of that type.

svn path=/nixos/trunk/; revision=9696
 2007-11-15 17:16:16 +00:00
Wouter den Breejen 14c2bb437d svn path=/nixos/trunk/; revision=9665 2007-11-13 16:38:39 +00:00
Eelco Dolstra 8b85db0728 * Upstart job for Nagios (system/network monitoring daemon). 
svn path=/nixos/trunk/; revision=9658
 2007-11-12 16:43:35 +00:00
Eelco Dolstra 2fc94b76fe * Eliminate all calls to config.get. 
svn path=/nixos/trunk/; revision=9619
 2007-11-09 18:49:45 +00:00
Michael Raskin c4ad7b56d1 Added a silent mention of evdev in xorg.conf, but removed actual dependency on it. 
svn path=/nixos/trunk/; revision=9614
 2007-11-09 13:55:07 +00:00
Eelco Dolstra e6b8dd5b25 * Cleanup. 
svn path=/nixos/trunk/; revision=9593
 2007-11-06 00:00:29 +00:00
Michael Raskin 8c9d312e21 Added xfs; fixed nixos-checkout 
svn path=/nixos/trunk/; revision=9579
 2007-11-05 08:54:30 +00:00
Michael Raskin b494c20cb5 Small correction to xserver.nix for compiz; also nixos-checkout now creates services where it should be. 
svn path=/nixos/trunk/; revision=9578
 2007-11-05 08:33:12 +00:00
Wouter den Breejen f7fd4c9a6d Fixed ../ to ../../services reference 
svn path=/nixos/trunk/; revision=9552
 2007-10-29 14:24:24 +00:00
Michael Raskin a357a601bf Enable composite extension for i810. 
svn path=/nixos/trunk/; revision=9541
 2007-10-27 17:47:54 +00:00
Wouter den Breejen 8881c10ca4 Dont let the 'normal' fsck check a ext3cow partitions anymore since it thinks it fixes inodes but it will actually cause ext3cow to loose data ..... 
svn path=/nixos/trunk/; revision=9537
 2007-10-27 13:04:00 +00:00
Michael Raskin 0ff3fc1882 Added option tcpEnable for X server. Needed for xmove. 
svn path=/nixos/trunk/; revision=9532
 2007-10-26 05:52:35 +00:00
Michael Raskin e4626e0f0d Added some options for manual text insertion into xorg.conf . Removed (commented out) MonitorLayout by default. It was the thing that prevents i915GM on laptops from working. Those who need it can add it back in extraDeviceOptions. 
svn path=/nixos/trunk/; revision=9527
 2007-10-26 04:28:01 +00:00
Eelco Dolstra 48acdef3c9 * Use the stdenv that does support \n in replacements. 
svn path=/nixos/trunk/; revision=9399
 2007-10-03 14:48:41 +00:00
Michael Raskin 33aa5d2d74 Separated keep-alive and additional keep-alive ping frequency. 
svn path=/nixos/trunk/; revision=9384
 2007-09-30 21:10:11 +00:00
Michael Raskin cf1140ee11 Added option for external firmware. 
svn path=/nixos/trunk/; revision=9379
 2007-09-28 07:58:40 +00:00
Michael Raskin 51626b0b66 Added checking of unkonwn options in configuration.nix and a system-wide font set changer. 
svn path=/nixos/trunk/; revision=9370
 2007-09-25 19:00:20 +00:00
Michael Raskin 07fd13f20e Added keyboard layout to options and internal AGPGART option 
svn path=/nixos/trunk/; revision=9369
 2007-09-24 19:32:21 +00:00
Michael Raskin 2cf1edf365 Added language switch support to xserver.nix 
svn path=/nixos/trunk/; revision=9367
 2007-09-24 09:19:34 +00:00
Michael Raskin a34885af7e Added synaptics support to xserver upstart-job. 
svn path=/nixos/trunk/; revision=9366
 2007-09-24 09:02:43 +00:00
Michael Raskin 8f126de2fb Changed X server upstart expression a bit, now works for my Intel 915GM notebook (with vesa at least). 
svn path=/nixos/trunk/; revision=9364
 2007-09-24 05:16:15 +00:00
Eelco Dolstra f2780fdc62 * Add a top-level default.nix for NixOS which has attributes useful 
for building parts of the system.  E.g.

  $ nix-build /etc/nixos/nixos -A upstartJobs.xserver

  to build the Upstart job for the X server, or

  $ nix-build /etc/nixos/nixos -A kernel

  to build the NixOS kernel.

* /etc/profile.sh: if ~/.nix-defexpr doesn't exist yet, create it as a
  directory and add links to root's channels, /etc/nixos/nixos and
  /etc/nixos/install-source.nix (as "nixpkgs_sys").
  
* boot.useKernel -> boot.kernel.

svn path=/nixos/trunk/; revision=9334
 2007-09-18 15:06:24 +00:00
Marc Weber 53a8d28f06 added udev rule to move /dev/tun to the place /dev/net/tun which most distros are using by default as well as tunctl 
svn path=/nixos/trunk/; revision=9252
 2007-09-04 13:44:26 +00:00
Yury G. Kudryashov 0c4a936419 Added .xsession support 
If user have ~/.xsession file it will be sourced.

svn path=/nixos/trunk/; revision=9231
 2007-09-01 17:57:04 +00:00
Michael Raskin f7d2ccdb87 Added mod_php option for httpd. 
svn path=/nixos/trunk/; revision=9155
 2007-08-18 15:19:27 +00:00
Eelco Dolstra ad22e587ab * nixos-rebuild: do a nix-pull on the Nixpkgs channel manifest. I.e., you 
don't need to be subscribed to the Nixpkgs channel to get binary downloads.
  This is possible because nix-pull is now pretty fast.

svn path=/nixos/trunk/; revision=9133
 2007-08-15 12:01:20 +00:00
Eelco Dolstra cc3803f207 * An Upstart job for ifplugd, which monitors Ethernet interfaces 
for cables being plugged in or unplugged.  When this occurs, the
  dhclient service is restarted to automatically obtain a new IP 
  address.  This is useful for roaming users (laptops).

svn path=/nixos/trunk/; revision=9124
 2007-08-14 16:43:56 +00:00
Michael Raskin 45c9f350b1 Corrected ircd-hybrid to fix the problem with finishing terminal-keeping thread. 
svn path=/nixos/trunk/; revision=9107
 2007-08-13 10:45:16 +00:00
Michael Raskin db3e598ba9 Corrected IRCD. 
svn path=/nixos/trunk/; revision=9103
 2007-08-11 21:48:08 +00:00
Michael Raskin 02c3fc72d8 Made ircd-hybrid wait gw6c coming up if it is enabled at all. 
svn path=/nixos/trunk/; revision=9096
 2007-08-10 18:52:35 +00:00
Eelco Dolstra 9cb4834270 * Add the default profile and the user's profile to $KDEDIRS. 
This is necessary for some KDE applications.

svn path=/nixos/trunk/; revision=9087
 2007-08-09 19:59:48 +00:00
Michael Raskin bb25a6ef96 Added short keep-alive period to gw6c, added ircd-hybrid service. 
svn path=/nixos/trunk/; revision=9071
 2007-08-08 20:42:25 +00:00
Michael Raskin 8843f3c287 Corrected dependencies for gw6c; also made httpd depend on gw6c if needed. 
svn path=/nixos/trunk/; revision=9029
 2007-08-02 21:26:38 +00:00
Eelco Dolstra 333d0dfe17 * Forward udev events to HAL. 
svn path=/nixos/trunk/; revision=9016
 2007-07-22 02:07:02 +00:00
Michael Raskin 055a950331 Apache httpd customization - extraDirectories & noUserDir . 
svn path=/nixos/trunk/; revision=8985
 2007-07-15 11:16:01 +00:00
Michael Raskin bf1033d2cb Added Gateway6 upstart-job and options for it. Sudo configuration for PAM 
is added (it is needed anyway), but still only NOPASSWD entries work.

svn path=/nixos/trunk/; revision=8966
 2007-07-09 11:21:04 +00:00
Yury G. Kudryashov cd1023c50d * Added boot.initrd.lvm flag for use NixOS with LVM2 root partition. 
* Added sis support for xserver.

svn path=/nixos/trunk/; revision=8924
 2007-06-28 09:57:36 +00:00
Eelco Dolstra f3f16dc169 * ALSA requires a group named "audio". 
svn path=/nixos/trunk/; revision=8863
 2007-06-10 20:17:51 +00:00
Eelco Dolstra 4d4387a70e * Allow jobs to specify groups. 
svn path=/nixos/trunk/; revision=8862
 2007-06-10 20:13:12 +00:00
Eelco Dolstra ea9e6bdbac * Re-enable some essential X server modules (in particular 
extmod, which contains XVideo).

svn path=/nixos/trunk/; revision=8857
 2007-06-09 21:12:48 +00:00
Eelco Dolstra 258ef4bf19 * Upstart job for HAL. 
svn path=/nixos/trunk/; revision=8854
 2007-06-09 20:05:04 +00:00
Eelco Dolstra 02514fc802 * /var/state -> /var/run. 
svn path=/nixos/trunk/; revision=8852
 2007-06-09 19:46:57 +00:00
Eelco Dolstra f70df0b275 * Added a job to start the D-Bus system-wide message bus daemon. 
svn path=/nixos/trunk/; revision=8848
 2007-06-08 18:56:55 +00:00
Eelco Dolstra 29c5178bdf * Declarative specification of user accounts. Jobs can now specify a 
list of user accounts that the job needs to run.  For instance, the
  SSH daemon job says:

    { name = "sshd";
      uid = (import ../system/ids.nix).uids.sshd;
      description = "SSH privilege separation user";
      home = "/var/empty";
    }

  The activation script creates the system users/groups and updates
  them as well.  So a change in the Nix expression can be realised in
  /etc/{group,passwd} by running nixos-rebuild.

svn path=/nixos/trunk/; revision=8846
 2007-06-08 15:41:12 +00:00
Eelco Dolstra 566c723986 * Allow the SLiM theme to be overriden. 
* Delete the SLiM log file on X startup.

svn path=/nixos/trunk/; revision=8832
 2007-06-05 11:51:59 +00:00
Eelco Dolstra c76fa154a6 * Fix the xserver job on non-nvidia cards. 
svn path=/nixos/trunk/; revision=8800
 2007-05-29 19:53:03 +00:00
Wouter den Breejen f8d77aa58e samba fix and xserver cleanup 
svn path=/nixos/trunk/; revision=8791
 2007-05-28 15:39:25 +00:00
Wouter den Breejen 2e50d9cd58 nixos dir: Xserver and samba nixos 
svn path=/nixos/trunk/; revision=8784
 2007-05-28 14:09:04 +00:00
Eelco Dolstra aab8fda25a * Option `networking.localCommands' to specify shell commands to be 
executed after the network interfaces have been initialised.

svn path=/nixos/trunk/; revision=8752
 2007-05-24 14:50:17 +00:00
Eelco Dolstra bec6f8a516 * Ignore modprobe errors. 
svn path=/nixos/trunk/; revision=8713
 2007-05-16 19:43:28 +00:00
Eelco Dolstra 66f0d29a48 * Use the new Intel driver. 
svn path=/nixos/trunk/; revision=8633
 2007-05-01 15:27:50 +00:00
Eelco Dolstra 719112e7bb * Add ~/bin to the PATH. 
svn path=/nixos/trunk/; revision=8557
 2007-04-10 14:18:15 +00:00
Eelco Dolstra 6113da3ce1 * Set the permissions of /dev/fuse to 0666. 
svn path=/nixos/trunk/; revision=8547
 2007-04-07 21:41:29 +00:00
Eelco Dolstra 174f4f2c99 * Set the console font, the keymap, and Unicode/ASCII mode. 
svn path=/nixos/trunk/; revision=8542
 2007-04-04 17:10:38 +00:00
Eelco Dolstra a9635d3b73 * Upstart job for the CUPS daemon. 
svn path=/nixos/trunk/; revision=8534
 2007-04-02 17:31:58 +00:00
Eelco Dolstra e312a8ef64 * Start the SSH agent on X11 login. 
svn path=/nixos/trunk/; revision=8531
 2007-04-02 15:01:09 +00:00
Eelco Dolstra 3e71bd9731 * Quick hack to prevent the udev job from messing up the device 
ownership of logged-in users.

svn path=/nixos/trunk/; revision=8530
 2007-04-02 15:00:31 +00:00
Eelco Dolstra 3f65f9ee55 * tty-backgrounds: declare /etc/splash properly. 
svn path=/nixos/trunk/; revision=8507
 2007-03-30 13:08:01 +00:00
Eelco Dolstra f10a95e88e * Refactoring: move stuff around. 
svn path=/nixos/trunk/; revision=8506
 2007-03-30 12:59:43 +00:00
Eelco Dolstra bf92844f16 * Allow Upstart jobs to declare additional /etc files. 
svn path=/nixos/trunk/; revision=8505
 2007-03-30 12:55:09 +00:00
Eelco Dolstra 5cf236ba04 * Thsi shouldn't be here. 
svn path=/nixos/trunk/; revision=8504
 2007-03-30 12:54:42 +00:00
Eelco Dolstra 100efeeafe * Specify the location of XKeyboard related stuff. 
svn path=/nixos/trunk/; revision=8501
 2007-03-30 12:33:42 +00:00
Eelco Dolstra 9cb9621fec * Start KDE properly. Make sure that some essential packages such as 
iceauth are in the system path when we're using KDE.

svn path=/nixos/trunk/; revision=8472
 2007-03-28 21:16:35 +00:00
Eelco Dolstra 8447e036fd * Create dhcpd.leases, otherwise dhcpd won't start. 
svn path=/nixos/trunk/; revision=8380
 2007-03-20 12:34:52 +00:00
Eelco Dolstra 4f3b2290b2 * FHS compliance: put persistent state in /var/lib, not /var/state. 
svn path=/nixos/trunk/; revision=8377
 2007-03-20 11:04:45 +00:00
Eelco Dolstra 8452dd3cd0 * Upstart job for dhcpd. 
svn path=/nixos/trunk/; revision=8311
 2007-03-16 16:41:38 +00:00
Eelco Dolstra 1ca3258c3f * More failure tolerance. 
svn path=/nixos/trunk/; revision=8303
 2007-03-16 14:46:56 +00:00
Eelco Dolstra b670a6d3d8 * Disable the zoom plugin. 
svn path=/nixos/trunk/; revision=8277
 2007-03-13 11:34:52 +00:00
Eelco Dolstra 8d731dacad * X session script: 
- Set the desktop background to the image ~/.background-image.
  - Depending on services.xserver.sessionType, start an xterm or a
    gnome-terminal as the "desktop" :-)

* Upstart jobs can now declare extra packages to be added to the
  system path through the `extraPath' attribute.  For instance, the
  ALSA job adds alsa-utils, and the X server job adds lots of stuff
  depending on the X configuration (e.g., xrandr, gnome-terminal,
  twm).

* Create a cdrom/dvd symlink for SCSI sr? devices.

svn path=/nixos/trunk/; revision=8221
 2007-03-06 00:07:00 +00:00
Eelco Dolstra ba845b19fb * Doh. 
svn path=/nixos/trunk/; revision=8170
 2007-03-04 21:25:32 +00:00
Eelco Dolstra 5ea2541f05 * Put compiz plugins in the right order. 
svn path=/nixos/trunk/; revision=8169
 2007-03-04 13:15:30 +00:00
Eelco Dolstra 119df37858 * Generate a wrapper around modprobe that sets MODULE_DIR. This is 
important for /proc/sys/kernel/modprobe, i.e., modprobing by the
  kernel.

svn path=/nixos/trunk/; revision=8164
 2007-03-04 01:16:24 +00:00
Eelco Dolstra 90f1dbe548 * Set some wireless settings (ESSID, WEP key). 
svn path=/nixos/trunk/; revision=8163
 2007-03-04 00:40:59 +00:00
Eelco Dolstra 2bff886ae1 * Udev rules/script to load device firmware automatically. The udev 
job takes a list of firmware directories in which to search for
  firmware files.  Right now this is just the Intel 2200 firmware (if
  enabled).

svn path=/nixos/trunk/; revision=8162
 2007-03-03 23:20:08 +00:00
Eelco Dolstra fb2a9d91a1 * Make sure the stop script gets executed on shutdown. 
svn path=/nixos/trunk/; revision=8126
 2007-03-01 00:50:17 +00:00
Eelco Dolstra ba56551986 * ALSA support: save/restore the volume settings, create device nodes 
in /dev/snd.

svn path=/nixos/trunk/; revision=8124
 2007-03-01 00:36:00 +00:00
Eelco Dolstra a177575779 * Handle windowManager == "compiz". Load Compiz's GConf settings 
automatically and turn on most plugins.

svn path=/nixos/trunk/; revision=8122
 2007-03-01 00:00:16 +00:00
Eelco Dolstra 5799fe7382 * Some hackery to get Metacity to find its default settings. GConf is 
really evil: it requires applications to install their GConf schemas
  into one of a fixed set of directories that gconfd searches.  This
  is of course rather imperative.

svn path=/nixos/trunk/; revision=8120
 2007-02-28 23:18:16 +00:00
Eelco Dolstra 8960f038dd * Allow metacity as the window manager. 
svn path=/nixos/trunk/; revision=8119
 2007-02-28 23:00:09 +00:00
Eelco Dolstra f948c10999 * Enable compositing in the X server. 
svn path=/nixos/trunk/; revision=8118
 2007-02-28 22:59:39 +00:00
Eelco Dolstra 935042365c * Allow a netmask to be specified for each interface. 
svn path=/nixos/trunk/; revision=8099
 2007-02-28 14:19:20 +00:00
Eelco Dolstra 94393dbd20 * Create /var/state/opengl-driver. 
svn path=/nixos/trunk/; revision=8069
 2007-02-27 00:50:22 +00:00
Eelco Dolstra a50097b9ca * Enable DRI support in the X server. 
svn path=/nixos/trunk/; revision=8067
 2007-02-27 00:31:04 +00:00
Eelco Dolstra fdb5a06fa4 * Specify the resolution and the video driver name in the configuration file. 
svn path=/nixos/trunk/; revision=8061
 2007-02-26 23:11:32 +00:00
Eelco Dolstra 4164a4ff3e * Construct the module path dynamically. 
svn path=/nixos/trunk/; revision=8059
 2007-02-26 21:39:07 +00:00
Eelco Dolstra ef6b45d924 * Start a display manager (SLiM). 
svn path=/nixos/trunk/; revision=8045
 2007-02-25 22:27:17 +00:00
Eelco Dolstra 426a8b806b * Use xinit to start the X server plus some initial clients (twm + xterm). 
svn path=/nixos/trunk/; revision=8043
 2007-02-25 16:20:14 +00:00
Eelco Dolstra 3ad2c91939 * Pure X server. All fonts are now in the Nix store. 
svn path=/nixos/trunk/; revision=8041
 2007-02-25 15:53:57 +00:00
Eelco Dolstra 0ee31b29ef * The daemon needs OpenSSH to be in the PATH for signing/verifying. 
svn path=/nixos/trunk/; revision=8025
 2007-02-22 18:04:18 +00:00
Eelco Dolstra ed36857d5e * Don't start dhclient on interfaces that are explicitly configured. 
svn path=/nixos/trunk/; revision=8014
 2007-02-22 14:26:53 +00:00
Eelco Dolstra e23de214ab * Only start dhclient on real network interfaces like eth0, not aliases like eth0:0. 
svn path=/nixos/trunk/; revision=8012
 2007-02-22 14:06:15 +00:00
Eelco Dolstra e576209a61 * ifconfig up -> ifconfig. 
svn path=/nixos/trunk/; revision=8011
 2007-02-22 14:00:22 +00:00
Martin Bravenboer 8e6c1ba85d Support organization configuration for subversion 
svn path=/nixos/trunk/; revision=8006
 2007-02-22 10:55:58 +00:00
Eelco Dolstra 1dd2eb58be * Set the hardware clock when shutting down. 
svn path=/nixos/trunk/; revision=7933
 2007-02-20 16:25:49 +00:00
Martin Bravenboer e99ffcbe71 changed the extraSubservices to a list of functions 
svn path=/nixos/trunk/; revision=7931
 2007-02-20 15:57:15 +00:00
Eelco Dolstra a17b1d5c5f * Kill all processes during shutdown so that we can unmount 
filesystems cleanly.

svn path=/nixos/trunk/; revision=7930
 2007-02-20 15:51:13 +00:00
Eelco Dolstra 454716ef4f * Typo. 
svn path=/nixos/trunk/; revision=7928
 2007-02-20 15:14:48 +00:00
Martin Bravenboer eeee6ea1e2 added configuration option for extraSubservices, which allows you to plugin an arbitrary service into the webserver. 
svn path=/nixos/trunk/; revision=7926
 2007-02-20 15:11:49 +00:00
Eelco Dolstra ef8e5716cb * Set the right PATH for dhclient. 
svn path=/nixos/trunk/; revision=7925
 2007-02-20 14:59:29 +00:00
Eelco Dolstra 66a9cfbcdc * Give everybody access to /dev/kvm. I *think* that's safe... 
svn path=/nixos/trunk/; revision=7923
 2007-02-20 14:30:05 +00:00
Eelco Dolstra 619c3e0465 * Don't use the DHCP wrapper. 
svn path=/nixos/trunk/; revision=7921
 2007-02-20 14:20:33 +00:00
Eelco Dolstra 06a6116c44 * Allow manual network configuration, i.e., specificying the IP 
address, gateway, and nameservers in the system configuration.

svn path=/nixos/trunk/; revision=7898
 2007-02-12 16:00:55 +00:00
Eelco Dolstra ac93023f35 * Pass userCreationDomain. 
svn path=/nixos/trunk/; revision=7891
 2007-02-12 11:57:18 +00:00
Eelco Dolstra 56576e7c28 * Prevent repeated mounting. 
svn path=/nixos/trunk/; revision=7882
 2007-02-08 15:24:13 +00:00
Eelco Dolstra 0685f24957 svn path=/nixos/trunk/; revision=7786 2007-01-23 20:09:06 +00:00
Eelco Dolstra 668c146e33 * Doh! Make sure that we put *only* splash_helper in the initrd and 
not all of splashutils, otherwise we get Glibc in the initrd.

svn path=/nixos/trunk/; revision=7771
 2007-01-23 13:44:41 +00:00
Eelco Dolstra cf9016d816 * Mount devpts. 
* Set the right permissions on /dev/tty and /dev/ptmx.

svn path=/nixos/trunk/; revision=7703
 2007-01-16 22:34:15 +00:00
Eelco Dolstra 554ae9908b * Some slightly hacky LDAP support. The problem is that Glibc has to 
be able to find the LDAP NSS module, which is normally installed in
  Glibc's prefix (under /lib/libnss_ldap...).  Of course, we can't do
  that; it wouldn't be pure.  As a workaround, we simply add nss_ldap
  to the LD_LIBRARY_PATH of the nscd daemon, which every other program
  uses for lookups.  So we don't have to put nss_ldap in the
  LD_LIBRARY_PATH of every program.

svn path=/nixos/trunk/; revision=7684
 2007-01-15 17:19:41 +00:00
Eelco Dolstra 9963b263d3 * NSCD daemon. 
svn path=/nixos/trunk/; revision=7645
 2007-01-11 23:55:25 +00:00
Eelco Dolstra daa8ecfe7a * Activate software RAID arrays. 
svn path=/nixos/trunk/; revision=7631
 2007-01-11 00:40:28 +00:00
Eelco Dolstra 66d4c6c4e2 * Ignore remount read-only errors. 
svn path=/nixos/trunk/; revision=7630
 2007-01-11 00:40:08 +00:00
Eelco Dolstra 158c303e2f * Enable SFTP support in sshd. 
svn path=/nixos/trunk/; revision=7622
 2007-01-10 17:19:17 +00:00
Eelco Dolstra 866d87c60b * Start the cron daemon. 
svn path=/nixos/trunk/; revision=7621
 2007-01-10 17:09:00 +00:00
Eelco Dolstra 5b993b4ff5 * Quick hack to prevent the system from hanging in halt/reboot: force 
NFS unmounts.  We have to do this because networking is already down
  by the time we get to the unmounting.  It would be better to unmount
  all remote file systems when an ip-down event occurs.

svn path=/nixos/trunk/; revision=7620
 2007-01-10 17:08:34 +00:00
Eelco Dolstra 99b24cf4d1 * Mount file systems when an ip-up event occurs (e.g., for NFS mounts). 
svn path=/nixos/trunk/; revision=7619
 2007-01-10 17:07:21 +00:00
Eelco Dolstra a7644b8855 * Support NFS mounts. 
svn path=/nixos/trunk/; revision=7615
 2007-01-10 14:34:31 +00:00
Eelco Dolstra 7ba1682c05 * In fileSystems: say label = "FOO"' instead of device = "LABEL=foo"'. 
svn path=/nixos/trunk/; revision=7611
 2007-01-10 13:58:48 +00:00
Eelco Dolstra 24e34612e3 * Allow swap devices to be specified by label. 
svn path=/nixos/trunk/; revision=7609
 2007-01-10 13:07:57 +00:00
Eelco Dolstra 60e4da4a9b * Hacked up support for volume labels. 
svn path=/nixos/trunk/; revision=7587
 2007-01-09 16:29:27 +00:00
Eelco Dolstra fb2d9f8347 * Race condition: splash_util fails if the virtual console doesn't 
exist yet (e.g., because mingetty hasn't started yet), so make sure
  it exists.

svn path=/nixos/trunk/; revision=7584
 2007-01-09 13:56:54 +00:00
Eelco Dolstra 2d20b19e5b * Don't get stuck in an infinite unmount loop on shutdown. 
svn path=/nixos/trunk/; revision=7580
 2007-01-09 09:52:16 +00:00
Eelco Dolstra 56da3e7887 * Allow any login program to be specified. 
svn path=/nixos/trunk/; revision=7575
 2007-01-08 21:34:30 +00:00
Eelco Dolstra b7f11ad98b * Generate sshd_config to set XAuthLocation if X11 forwarding is 
enabled.

svn path=/nixos/trunk/; revision=7548
 2007-01-07 10:19:16 +00:00
Eelco Dolstra acacfda1b2 * Remove references to stdenvNew. 
svn path=/nixos/trunk/; revision=7532
 2007-01-04 10:21:25 +00:00
Eelco Dolstra 162181ffba * LVM support (in stage 2; having / on LVM is not yet supported). LVM 
triggers a new-devices event so that the filesystems job mounts file
  systems on the logical volumes.

svn path=/nixos/trunk/; revision=7478
 2006-12-24 01:07:28 +00:00
Eelco Dolstra cb4e81d38f * Handle devices that are symlinks. 
svn path=/nixos/trunk/; revision=7477
 2006-12-24 00:54:52 +00:00
Eelco Dolstra f25ce41c18 * Option boot.doHardwareScan to disable the hardware scan. Also, if 
the flag "safemode" is specified on the kernel command line, also
  disable the hardware scan.
* Option boot.kernelModules to specify a set of modules to be loaded
  in stage 2 (in addition to the initrd modules in
  boot.initrd.kernelModules).

svn path=/nixos/trunk/; revision=7466
 2006-12-22 23:34:42 +00:00
Eelco Dolstra 75e1652f05 * Chroot ntpd. 
svn path=/nixos/trunk/; revision=7464
 2006-12-22 19:29:18 +00:00
Eelco Dolstra 2d605d7041 * Don't run ntpd as root. 
svn path=/nixos/trunk/; revision=7463
 2006-12-22 19:23:19 +00:00
Eelco Dolstra f037f6fbd4 * Emit ip-up / ip-down events when we get or lose a DHCP lease. 
* ntpd: start on ip-up, not when the network interfaces are up,
  otherwise it will fail because it can't find any servers right
  away.

svn path=/nixos/trunk/; revision=7461
 2006-12-22 17:28:25 +00:00
Eelco Dolstra 617ebcbcce * Job for ntpd. Doesn't seem to work quite right, but that might be a 
VMware problem.

svn path=/nixos/trunk/; revision=7460
 2006-12-21 23:43:17 +00:00
Eelco Dolstra 647db4dd2a * Don't try to mount when the mount point isn't there yet. 
* Run fsck.

svn path=/nixos/trunk/; revision=7458
 2006-12-21 20:08:15 +00:00
Eelco Dolstra e3acce2f4f * Wait until the temporary udevd is gone. 
svn path=/nixos/trunk/; revision=7457
 2006-12-21 20:07:46 +00:00
Eelco Dolstra d54b0a0749 * Don't refer to non-existent groups. 
svn path=/nixos/trunk/; revision=7456
 2006-12-21 19:22:06 +00:00
Eelco Dolstra 3b9a7c747e * Trigger swap on new-devices. 
svn path=/nixos/trunk/; revision=7455
 2006-12-21 19:21:36 +00:00
Eelco Dolstra 896a935de1 * Repeatedly unmount file systems until a fixpoint is reached (no more 
file systems can be unmounted).
* Remount all un-unmountable file systems as read-only.
* Explicitly call losetup to get rid of loopback devices to work
  around a bug in mount.

svn path=/nixos/trunk/; revision=7454
 2006-12-21 18:12:19 +00:00
Eelco Dolstra bf8e19f6db * Mount file systems until a fixpoint is reached. 
* Work properly for loopback mounts.

svn path=/nixos/trunk/; revision=7453
 2006-12-21 18:10:33 +00:00
Eelco Dolstra f89f3c0643 * Emit the new-devices event to cause the filesystems job to be 
rerun.

svn path=/nixos/trunk/; revision=7452
 2006-12-21 18:09:10 +00:00
Eelco Dolstra 42cf9a9050 * Respect the options and fsType attributes. 
* Remount file systems to allow mount options to be changed
  dynamically.

svn path=/nixos/trunk/; revision=7450
 2006-12-21 14:44:22 +00:00
Eelco Dolstra b363fc4c57 * Mount all file systems in the fileSystems option. 
svn path=/nixos/trunk/; revision=7449
 2006-12-21 14:22:40 +00:00
Eelco Dolstra c78a1d9781 * Upstart job to start swapping to the devices or files listed in the 
swapDevices option.

svn path=/nixos/trunk/; revision=7448
 2006-12-21 01:07:23 +00:00
Eelco Dolstra 2d6e8e63ae * Forgot to commit. 
svn path=/nixos/trunk/; revision=7430
 2006-12-19 21:31:19 +00:00
Eelco Dolstra af1c54fbdc * Subversion subservice. 
* Example of a NixOS configuration for a Subversion server.

svn path=/nixos/trunk/; revision=7412
 2006-12-19 01:03:15 +00:00
Eelco Dolstra 9f47929138 * Apache configuration. 
svn path=/nixos/trunk/; revision=7393
 2006-12-18 19:46:48 +00:00
Eelco Dolstra 70f929a0a5 * Upstart job for Apache. 
svn path=/nixos/trunk/; revision=7391
 2006-12-18 19:20:03 +00:00
Eelco Dolstra 84f1e01646 * Doh. 
svn path=/nixos/trunk/; revision=7384
 2006-12-18 15:52:43 +00:00
Eelco Dolstra 87e2456814 * Use getenv/useradd. 
svn path=/nixos/trunk/; revision=7382
 2006-12-18 15:48:29 +00:00
Eelco Dolstra 3e7f4280df * activate-configuration.sh: make sure that we're running on a NixOS 
installation to prevent horrible accidents.
* Add the kernel parameters to isolinux.cfg.
* Use useradd/groupadd to create users/groups; use Glibc's getent to
  check for existence.
* Create the root account properly.

svn path=/nixos/trunk/; revision=7357
 2006-12-16 21:48:12 +00:00
Eelco Dolstra 8f21b0119c * Get the CD to build again. 
svn path=/nixos/trunk/; revision=7356
 2006-12-16 18:24:49 +00:00
Eelco Dolstra 57663aae6b * Some basic udev rules: give the right permission to /dev/null etc., 
put input devices in /dev/input, and create a symlink /dev/cdrom for
  CD-ROM devices.

svn path=/nixos/trunk/; revision=7335
 2006-12-13 14:24:33 +00:00
Eelco Dolstra f29c93830e * "set" -> "env". 
svn path=/nixos/trunk/; revision=7333
 2006-12-13 13:09:20 +00:00
Eelco Dolstra 07627d8cdd * Move starting of udevd (and udevtrigger/settle) into an Upstart 
job.

svn path=/nixos/trunk/; revision=7330
 2006-12-13 12:17:38 +00:00
Eelco Dolstra 4b5b0d2c66 * Purify the sshd configuration file (don't put it in /etc/ssh). 
svn path=/nixos/trunk/; revision=7320
 2006-12-12 15:32:28 +00:00
Eelco Dolstra b80769d5ae * Hm, "set" doesn't seem to do the right thing. 
svn path=/nixos/trunk/; revision=7308
 2006-12-11 02:55:28 +00:00
Eelco Dolstra 578b56d3c6 * Make halt/reboot work again (umount and reboot were no longer in 
$PATH).

* Use the login from pam_login instead of shadowutils.

svn path=/nixos/trunk/; revision=7302
 2006-12-11 00:52:36 +00:00
Eelco Dolstra c063ea2bfa * Use runCommand. 
svn path=/nixos/trunk/; revision=7300
 2006-12-10 22:43:04 +00:00
Eelco Dolstra acf656125c * Lots of refactoring. 
* Clear the PATH in most scripts.  This helps to ensure purity.

svn path=/nixos/trunk/; revision=7299
 2006-12-10 22:29:44 +00:00
Eelco Dolstra 2fe4badb9a * Start the Nix daemon to enable multi-user package management in 
NixOS.

svn path=/nixos/trunk/; revision=7291
 2006-12-09 03:11:14 +00:00
Eelco Dolstra f049c35a86 * More semi-purification of /etc. 
svn path=/nixos/trunk/; revision=7290
 2006-12-09 02:51:42 +00:00
Eelco Dolstra ec764b7c08 * Helper script to check for and create accounts. 
svn path=/nixos/trunk/; revision=7171
 2006-11-29 23:10:22 +00:00
Eelco Dolstra 79464e0d9c * Don't start X by default. 
svn path=/nixos/trunk/; revision=7170
 2006-11-29 22:34:59 +00:00
Eelco Dolstra 8532f2be8e * Add the X server as an Upstart service. The X server is pure, 
except for the fonts, which are still hardcoded.  The current
  configuration uses the VESA driver, which should work on most
  machines.  Of course, the configuration should now be generated from
  a higher-level specification.

svn path=/nixos/trunk/; revision=7165
 2006-11-28 22:27:56 +00:00
Eelco Dolstra 0817c307dc * Moving stuff around. 
svn path=/nixos/trunk/; revision=7155
 2006-11-27 19:49:05 +00:00