Commit graph

444 commits

Author SHA1 Message Date
Eelco Dolstra ebb43a3f67 * Make the location of Nixpkgs a function argument (defaulting
to ../../nixpkgs).  This makes the "pkgs" symlink under the 
  nixos checkout unnecessary.

svn path=/nixos/trunk/; revision=11989
2008-06-05 15:33:17 +00:00
Michael Raskin eff945115b Added gpm service
svn path=/nixos/trunk/; revision=11952
2008-06-03 07:06:35 +00:00
Michael Raskin ecef3b1f61 Passing packages list to extraModulePackages
svn path=/nixos/trunk/; revision=11884
2008-05-22 19:30:00 +00:00
Eelco Dolstra bb1ee3f190 * boot.kernel renamed to boot.kernelPackages (see the help for a
description) to allow all kernel-related packages to be overriden
  easily.  For instance, you can now say in configuration.nix

    boot = {
      kernelPackages = pkgs: pkgs.kernelPackages_2_6_25;
    };

  to use Linux 2.6.25.x.  Externel kernel module packages (like
  the NVIDIA drivers) appropriate for this kernel will then be used
  automatically.

svn path=/nixos/trunk/; revision=11880
2008-05-22 11:59:46 +00:00
Michael Raskin 27fced519e Forgot description is mandatory for all options. Added description to synaptics fine-tune settings.
svn path=/nixos/trunk/; revision=11857
2008-05-20 14:59:27 +00:00
Eelco Dolstra 3ed80192c0 * Every option needs a description, otherwise the manual can't be
built...

svn path=/nixos/trunk/; revision=11856
2008-05-20 14:53:55 +00:00
Michael Raskin b5451023a2 Applied patch sent by justbeingglad long ago..
svn path=/nixos/trunk/; revision=11833
2008-05-16 07:32:00 +00:00
Eelco Dolstra cc7f3c7aaa * URL updates.
svn path=/nixos/trunk/; revision=11801
2008-05-09 15:08:43 +00:00
Eelco Dolstra 3e087c0f73 * Include "dm_mod" in the initrd by default for LVM users.
svn path=/nixos/trunk/; revision=11795
2008-05-09 10:46:10 +00:00
Eelco Dolstra 8583c52c2c * Enable lvm by default.
svn path=/nixos/trunk/; revision=11794
2008-05-09 10:08:21 +00:00
Eelco Dolstra 6d2c1eb838 * module_aggregation -> aggregateModules (naming convention).
svn path=/nixos/trunk/; revision=11785
2008-05-08 15:36:56 +00:00
Marc Weber 7a7582ec01 * added extraModules apache configuration option
Eelco, can your review this patch ?
I hope it fits your design - if not revert it
This way we can drop the mod_php option (See example)

svn path=/nixos/trunk/; revision=11734
2008-04-27 23:56:51 +00:00
Eelco Dolstra 5dbe45bfea * Modified the SSL configuration a bit. Instead of having a httpPort
and a httpsPort, there are now options "port" and "enableSSL".  So
  to get https you should typically set up a vhost like this:

    virtualHosts = [
      { hostName = "foo.example.org";
        enableSSL = true;
        sslServerCert = "...";
        sslServerKey = "...";
      }
    ];

* sslServerCert and sslServerKey can be set per vhost.  This is
  currently only useful when doing IP-based vhosting.

* enableUserDir is now a per-vhost setting, as it should be.

* Convenience option globalRedirect to redirect the entire host to
  some URL.

svn path=/nixos/trunk/; revision=11704
2008-04-24 11:56:38 +00:00
Nicolas Pierron 38874d8025 Add options to hide the cursor and define the default user.
svn path=/nixos/trunk/; revision=11664
2008-04-21 13:05:35 +00:00
Michael Raskin 5e1ee10f3c HTTPS support in httpd upstart job fixed.
svn path=/nixos/trunk/; revision=11613
2008-04-12 20:08:35 +00:00
Michael Raskin bfa0e51ee5 Added possibility to modify Xorg passed to upstart-job and xlaunch
svn path=/nixos/trunk/; revision=11555
2008-04-11 09:20:39 +00:00
Eelco Dolstra 99480990f6 * Added ncurses to the system path (mostly for the "clear" and "reset" commands).
svn path=/nixos/trunk/; revision=11528
2008-04-10 07:43:49 +00:00
Michael Raskin 8c4ebbd24a Some tweaks for Gateway6 job
svn path=/nixos/trunk/; revision=11496
2008-04-08 21:41:01 +00:00
Ludovic Courtès a0fc21eda3 Add `atd' Upstart job.
svn path=/nixos/trunk/; revision=11435
2008-04-01 10:16:35 +00:00
Ludovic Courtès 3957962cf9 BitlBee: Run as bitlbee' instead of root'.
svn path=/nixos/trunk/; revision=11292
2008-03-26 16:42:57 +00:00
Ludovic Courtès 1a75f0a5a8 Add nssModules' to systemPathsList', add /lib' to systemPath', and
add `/var/run/current-system/sw/lib' to `LD_LIBRARY_PATH'.  This should allow
NSS modules to be added and taken into account by applications without
the need to reboot.

svn path=/nixos/trunk/; revision=11290
2008-03-26 16:23:52 +00:00
Michael Raskin dc27e80fad Changes to support swsusp and custom kernels.
svn path=/nixos/trunk/; revision=11272
2008-03-24 19:37:32 +00:00
Michael Raskin 9ab654a6c4 Fix regexp to determine xserver and dbus correctly
svn path=/nixos/trunk/; revision=11265
2008-03-22 18:53:55 +00:00
Eelco Dolstra d6e1828c13 * Speed up activating the configuration: don't do a find
on all of /etc, skip /etc/nixos.  (Actually, the NixOS/Nixpkgs
  sources probably shouldn't be stored in /etc...)

svn path=/nixos/trunk/; revision=11261
2008-03-22 16:04:38 +00:00
Eelco Dolstra 047241dd5d * When restarting a job, *really* wait until the job has
stopped before starting it again.

svn path=/nixos/trunk/; revision=11232
2008-03-20 14:44:36 +00:00
Ludovic Courtès 79ffaeb2e7 activate-configuration: Look for setuid executables in the default profile.
svn path=/nixos/trunk/; revision=11202
2008-03-19 12:34:39 +00:00
Ludovic Courtès d1f29d328d Add support for `nss-mdns'.
Currently, the solution is a bit hackish since running applications
will not work after a `nixos-rebuild' because `libnss_mdns' is not
in their `LD_LIBRARY_PATH'.

svn path=/nixos/trunk/; revision=11162
2008-03-17 13:58:57 +00:00
Eelco Dolstra 52aed402db * Moved to Nixpkgs.
svn path=/nixos/trunk/; revision=11155
2008-03-17 10:51:09 +00:00
Ludovic Courtès 6354623143 Add known setuid programs to the path' variable passed to activate-configuration'.
This is really a hack since programs not known to `system.nix' will not be in the path
of `activate-configuration', which consequently creates empty `.real' files under
`/var/setuid-wrappers'.  I don't know what the best way to address this is: let admins
write `.real' files by hand?  Add a `setuidPackages' attribute, listing the names of
packages that contain the binaries listed in `setuidPrograms'?

svn path=/nixos/trunk/; revision=11153
2008-03-17 10:31:40 +00:00
Ludovic Courtès 5568ef6e8d activate-configuration: Report it if a setuid program was not found.
svn path=/nixos/trunk/; revision=11152
2008-03-17 10:11:48 +00:00
Marc Weber 40d9d62879 added mkOption extraConfig for httpd apache service
( added \n in config concatenation as well )
added serviceProposal, examples see upstart-jobs/newProposal/*.nix
  enhancement: everything belonging to one job is within the same file 
  (was: upstart-jobs/default.nix, options.nix and the job file)
  drawback: options won't be included within the manual 
            (can be fixed see comments in options.nix)
  comment: looking at the funtion newProposalJobs maybe it's overkill? 
           Hope it pays off if we start having dozens of small different services..


svn path=/nixos/trunk/; revision=11141
2008-03-16 01:05:40 +00:00
Ludovic Courtès cf16b3acfe Add `portmap' job.
svn path=/nixos/trunk/; revision=11140
2008-03-15 23:40:44 +00:00
Sander van der Burg 6c8bae53c1 Added PermitRootLogin option for sshd
svn path=/nixos/trunk/; revision=11121
2008-03-14 12:53:14 +00:00
Eelco Dolstra 8389cc378a * Hack: don't restart dbus automatically, it kills the X server.
Apparantly the cause was not the upgrade to DBus 1.1.20 but
  something else.

svn path=/nixos/trunk/; revision=11095
2008-03-13 10:15:12 +00:00
Nicolas Pierron 58240dc30d Add the option xkbModel in the xserver.
svn path=/nixos/trunk/; revision=11041
2008-03-10 17:33:13 +00:00
Ludovic Courtès 43a4353c67 Add support for the Avahi daemon.
The daemon starts correctly but, for some reason, clients fail
to connect to it.

svn path=/nixos/trunk/; revision=10999
2008-03-06 17:11:22 +00:00
Ludovic Courtès 3cde6bd187 Add support for lshd (SSH2 daemon of GNU lsh).
svn path=/nixos/trunk/; revision=10969
2008-03-05 16:03:09 +00:00
Michael Raskin cf28e6d341 MS Core Fonts are now optional
svn path=/nixos/trunk/; revision=10962
2008-03-05 14:30:19 +00:00
Michael Raskin cedc8aaf58 Now public key is copied to store (and its hash affects derivation hash)
svn path=/nixos/trunk/; revision=10954
2008-03-04 16:06:33 +00:00
Michael Raskin 6d07b2a545 Added seccureUser to default environment (it is the encryption tool I hope to use for configuration files), made checkConfigurationOptions on by default, added nixos-gen-seccure-keys to nixosTools
svn path=/nixos/trunk/; revision=10935
2008-03-03 23:30:49 +00:00
Michael Raskin c0dd88a973 Added openfire upstart job. Note: after enabling it first time, go 127.0.0.1:9090 to configure it!
svn path=/nixos/trunk/; revision=10930
2008-03-03 19:28:10 +00:00
Michael Raskin 16a8462820 Changed FontDir to also handle TTF.
svn path=/nixos/trunk/; revision=10912
2008-03-02 18:46:57 +00:00
Ludovic Courtès 17d527a540 Fix typo related to BitlBee.
svn path=/nixos/trunk/; revision=10791
2008-02-20 22:46:53 +00:00
Eelco Dolstra 50800ad3b5 svn path=/nixos/trunk/; revision=10781 2008-02-20 13:29:08 +00:00
Ludovic Courtès 063fd9eeb6 Install BitlBee if enabled.
svn path=/nixos/trunk/; revision=10780
2008-02-20 13:18:41 +00:00
Tobias Hammerschmidt 672d293c2b Added support for the Zydas zd1211 firmware.
svn path=/nixos/trunk/; revision=10763
2008-02-20 09:01:26 +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 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 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
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
Marc Weber 598848d6af patches provided by Tobias Hammerschmidt
svn path=/nixos/trunk/; revision=10055
2008-01-02 21:16:58 +00:00
Eelco Dolstra 90a0d64bcd svn path=/nixos/trunk/; revision=10051 2008-01-02 15:31:04 +00:00
Eelco Dolstra 5ec82632f2 * Use Nix 0.11.
svn path=/nixos/trunk/; revision=10048
2008-01-02 13:05:24 +00:00
Eelco Dolstra 0cb6f3e5c3 * Missing description.
svn path=/nixos/trunk/; revision=10047
2008-01-02 12:50:46 +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 ae6104ae59 Fixed a bit about child configurations, added an option to not run X job, but create it, and to export configuration files from it.
svn path=/nixos/trunk/; revision=9986
2007-12-31 08:52:59 +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 f81bebe2d7 Added possibility of building multiple configurations by one nixos-rebuild.
svn path=/nixos/trunk/; revision=9959
2007-12-20 11:36:30 +00:00
Michael Raskin 6733486ec8 Corrected fontDir builder; beginning of changes to allow configuration having multiple variaions in GRUB menu/
svn path=/nixos/trunk/; revision=9957
2007-12-20 04:36:30 +00:00
Michael Raskin 189a608cf5 Now copyKernels allows both /nix/store and /boot be on separate partitions (you need to specify where /boot is for this).
svn path=/nixos/trunk/; revision=9949
2007-12-16 18:56:36 +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
Eelco Dolstra becb4b69c1 Allow the hostname to be empty (to obtain it using dhcp).
svn path=/nixos/trunk/; revision=9857
2007-12-04 15:02:48 +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
Yury G. Kudryashov 5cd638aad8 new option: paths to link to /var/run/current-system/sw
svn path=/nixos/trunk/; revision=9828
2007-12-01 20:44:27 +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 1089c1f7fa * Fix the manual.
svn path=/nixos/trunk/; revision=9769
2007-11-21 14:39:52 +00:00
Eelco Dolstra b880647870 * Options users.extraUsers and users.extraGroups to specify additional
users and groups that the system should create automatically.

svn path=/nixos/trunk/; revision=9705
2007-11-16 13:26:34 +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
Michael Raskin de01f56b42 Corrected some SVN service glitches; added switchable Nix
svn path=/nixos/trunk/; revision=9662
2007-11-13 15:51:24 +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 646c2e4dec * Put user "root" in the group "root".
svn path=/nixos/trunk/; revision=9654
2007-11-12 14:59:23 +00:00
Eelco Dolstra a0f5a93229 * Create /var/tmp.
svn path=/nixos/trunk/; revision=9653
2007-11-12 14:45:26 +00:00
Michael Raskin 7d94e2ed4d Removed bad characters in descriptions, changed system.nix checker invokation
svn path=/nixos/trunk/; revision=9620
2007-11-10 13:35:15 +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
Eelco Dolstra 62c1f0ddcc * Converted the option declarations in options.nix to nested attribute
sets that match the hierarchical structure of the options.  So
  instead of

    {
      name = ["time" "timeZone"];
      default = "CET";
      example = "America/New_York";
      description = "The time zone used when displaying times and dates.";
    }

  we have

    time = {
      timeZone = {
        default = "CET";
        example = "America/New_York";
        description = "The time zone used when displaying times and dates.";
      };
    };

  And instead of `config.get ["time" "timeZone"]' you can now just say
  `config.time.timeZone'.  Furthermore, this option representation
  will allow option structures with repetition (such as in
  networking.interfaces or services.httpd.subservices) to be defined.

svn path=/nixos/trunk/; revision=9618
2007-11-09 18:12:23 +00:00
Eelco Dolstra 5bb4e343b4 * Configuration options networking.defaultMailServer to enable direct mail
delivery without a local mail server (via ssmtp).
* Add vimDiet to the CD, not the system path in general.

svn path=/nixos/trunk/; revision=9607
2007-11-08 18:15:12 +00:00
Marc Weber 89670079ab vimDiet and reiserfsprogs added to systemPathList
svn path=/nixos/trunk/; revision=9600
2007-11-07 22:00:05 +00:00
Eelco Dolstra 81c7e17e02 * An option nix.useChroot to enable chroot builds in NixOS.
svn path=/nixos/trunk/; revision=9583
2007-11-05 11:19:51 +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
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 b4be8e3b92 Added a way to add arbitrary entries in /etc/hosts .
svn path=/nixos/trunk/; revision=9528
2007-10-26 04:49:44 +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
Yury G. Kudryashov 607a32c86f Fixed typo in options.nix
svn path=/nixos/trunk/; revision=9494
2007-10-19 19:15:48 +00:00
Eelco Dolstra 2cc89b09e6 * Create /dev/{stdin,stdout,stderr}.
svn path=/nixos/trunk/; revision=9416
2007-10-06 18:53:50 +00:00
Michael Raskin 5c08d306e5 Some more corrections to fontDir; now suitable as fontPath for Xvnc
svn path=/nixos/trunk/; revision=9410
2007-10-05 12:51:05 +00:00
Michael Raskin 9ce2dbf8d3 Corrected X11-fonts, now it is linked in /var/run/current-system
svn path=/nixos/trunk/; revision=9409
2007-10-05 07:45:56 +00:00
Michael Raskin 44d09afffb Added dir option to link all fonts into share.
svn path=/nixos/trunk/; revision=9407
2007-10-05 07:25:13 +00:00
Eelco Dolstra 94b7b9377c * Option fonts.enableGhostscriptFonts to make the Ghostscript fonts
available to X11 apps.

svn path=/nixos/trunk/; revision=9401
2007-10-03 15:44:30 +00:00
Eelco Dolstra f402fd73f2 * Print a sensible error message if there are multiple declarations
for an option.
* Removed double declaration for services.xserver.layout.

svn path=/nixos/trunk/; revision=9398
2007-10-03 13:27:45 +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
Eelco Dolstra c43dc7b013 * Allow Upstart's init to be upgraded in a running system.
svn path=/nixos/trunk/; revision=9375
2007-09-27 12:24:05 +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
Yury G. Kudryashov 867d814d27 Remove unneeded copy of lvm in initrd.
Something replaces symlinks in initrd with copies. Removed symlinks to lvm and
changed syntax (vgscan -> lvm vgscan).

svn path=/nixos/trunk/; revision=9233
2007-09-01 18:05:46 +00:00
Eelco Dolstra 475ee4548d * Create /nix/var/nix/gcroots/per-user.
svn path=/nixos/trunk/; revision=9189
2007-08-22 14:58:51 +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 2a4417d637 * make-etc / activate-configuration: allow /etc files to be installed
as regular files instead of symlinks to the store.
* Sudo configuration, enabled through security.sudo.enable (on by
  default).  The contents of the sudoers file is specified in
  security.sudo.configFile.  The default sudoers file allows members
  of the new "wheel" group to run any command.

svn path=/nixos/trunk/; revision=9138
2007-08-16 15:09:06 +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
Eelco Dolstra 05e9b29525 * Search /nix/var/nix/manifests for GC roots under NixOS.
svn path=/nixos/trunk/; revision=9090
2007-08-09 23:54:23 +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
Wouter den Breejen 13f94dacc5 Added mirrors for bootsplash.de files
svn path=/nixos/trunk/; revision=9008
2007-07-20 12:33:46 +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
Eelco Dolstra 2cfd8c9a3a * Work properly when lvm is disabled.
svn path=/nixos/trunk/; revision=8947
2007-07-05 14:19:48 +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
Michael Raskin 58b29cd565 Added possibility to give configurations custom names.
svn path=/nixos/trunk/; revision=8915
2007-06-23 16:09:05 +00:00
Michael Raskin f0d1570377 Added kernel selection parameter, boot.useKernel
svn path=/nixos/trunk/; revision=8914
2007-06-23 15:48:09 +00:00
Michael Raskin 0e92d41124 Added configuration.nix option to add entries into nix.conf .
svn path=/nixos/trunk/; revision=8910
2007-06-21 17:14:33 +00:00
Eelco Dolstra c819d76ec7 * Option boot.extraGrubEntries to add arbitrary text to Grub's menu.lst.
svn path=/nixos/trunk/; revision=8883
2007-06-15 11:40:57 +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 1f1db4c48f * Use pam_console to change the ownership of various devices (sound,
CD-ROM drive, etc.) to the logged in user.  Woohoo!  Finally, no
  more chown /dev/snd/*.
* Get rid of spurious error messages about pam_ldap when we're not
  using LDAP.

svn path=/nixos/trunk/; revision=8861
2007-06-10 20:02:07 +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 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
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 4f5de40814 * Add sysvtools to the system path.
svn path=/nixos/trunk/; revision=8738
2007-05-23 14:29:34 +00:00
Eelco Dolstra 7243eb1d1d * Create /bin on the CD to suppress the /bin/sh symlink creation
error.
* Put the top-level system config on the CD, otherwise root doesn't
  get a working login shell on the CD (and the system PATH is broken
  as well).

svn path=/nixos/trunk/; revision=8658
2007-05-09 17:32:41 +00:00
Eelco Dolstra a779e582cb * Doh.
svn path=/nixos/trunk/; revision=8651
2007-05-02 22:18:57 +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 c1d072c17d * Added `time' to the system path.
svn path=/nixos/trunk/; revision=8600
2007-04-20 08:51:41 +00:00
Eelco Dolstra 3ab4e0f17f * Allow packages to be added to the system path like so:
environment = {
    extraPackages = pkgs: [
      pkgs.firefox
      pkgs.thunderbird
    ];
  };

  This approach is often actually nicer than adding to the default
  profile using nix-env, since it's declarative, and all packages
  declared here will be updated automatically when you run
  nixos-rebuild.

* Allow additional setuid programs to be specified in
  security.extraSetuidPrograms.

svn path=/nixos/trunk/; revision=8548
2007-04-07 21:44:26 +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 464d252d55 * Set the LANG environment variable (default is en_US.UTF-8,
can be overriden through the system configuration).

svn path=/nixos/trunk/; revision=8541
2007-04-04 13:47:54 +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 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 100efeeafe * Specify the location of XKeyboard related stuff.
svn path=/nixos/trunk/; revision=8501
2007-03-30 12:33:42 +00:00
Eelco Dolstra 1bd112d4a7 * Set the TZDIR variable so that the KDE clock can find the timezone
definitions (NIXOS-56).

svn path=/nixos/trunk/; revision=8488
2007-03-29 17:46:36 +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 603e598a84 * Add wireless-tools to the system path.
svn path=/nixos/trunk/; revision=8471
2007-03-28 21:15:23 +00:00
Eelco Dolstra 5c984a7b99 * Don't include ~/.bashrc.
svn path=/nixos/trunk/; revision=8413
2007-03-26 08:54:11 +00:00
Eelco Dolstra 128660d8e2 * Root installs in the system-wide profile
(/nix/var/nix/profiles/default) by default.
* In /etc/profile, put /var/run/current-system/sw/[s]bin in $PATH, not
  the targets of those symlink.  Otherwise users need to log out to
  make configuration changes to the systemPath take effect.

svn path=/nixos/trunk/; revision=8384
2007-03-20 13:50:47 +00:00
Eelco Dolstra be8bcebfe0 * Use /var/run/current-system/sw/bin/bash as the default shell for new
accounts.  Obviously we cannot put the store path of bash in
  /etc/passwd since it's too fragile (it could be garbage collected),
  hence this indirection.

svn path=/nixos/trunk/; revision=8383
2007-03-20 13:30:14 +00:00
Eelco Dolstra c10fe148a3 * /var/run/current-system symlinks to the top-level path of the system
configuration now.
* /var/run/booted-system symlinks to the system configuration used at
  boot time.

svn path=/nixos/trunk/; revision=8381
2007-03-20 13:01:53 +00:00
Eelco Dolstra 80a0904196 * Set /var/run/current-system to the currently active system
configuration, and use it as a garbage collection root to prevent
  the current configuration from being GC'ed (which was previously
  possible if the configuration was activated using "nixos-rebuild
  test", or if the configuration's generation symlink had been removed
  from the system profile).

  This isn't quite right yet due to a layering problem:
  activate-configuration.sh doesn't know the top-level store path of
  the configuration.

svn path=/nixos/trunk/; revision=8379
2007-03-20 11:45:59 +00:00