Commit graph

301 commits

Author SHA1 Message Date
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 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 e48a01523f Gateway6 upstart job update.
svn path=/nixos/trunk/; revision=10953
2008-03-04 15:30:54 +00:00
Eelco Dolstra 65deea6610 * dbus-uuidgen is now in dbus.tools. Also, a quick hack to get
DBus clients working again: they expect dbus-launch in the 
  dbus.daemon prefix, where it no longer is.  Fortunately they
  also search in the path.  But a better fix is to move dbus-launch
  to dbus.daemon.

svn path=/nixos/trunk/; revision=10951
2008-03-04 14:58:48 +00:00
Eelco Dolstra 8b98c3b125 svn path=/nixos/trunk/; revision=10947 2008-03-04 13:37:52 +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
Eelco Dolstra c4617e5b04 svn path=/nixos/trunk/; revision=10853 2008-02-25 13:30:23 +00:00
Eelco Dolstra d5c09f9b61 * Clear args (NIXPKGS-86).
svn path=/nixos/trunk/; revision=10852
2008-02-25 13:20:00 +00:00
Eelco Dolstra 3dcd0cc7a4 * stdenvUsingSetupNew2 -> stdenv.
svn path=/nixos/trunk/; revision=10850
2008-02-25 12:43:38 +00:00
Michael Raskin 59ea75d88e !!! Important notice. This commit should be already done at the time of nixpkgs-stdenv-updates-merge going to trunk. This commit should be reverted if you are using old nixpkgs trunk. I hope there will be no commits to nixos/ before merger...
svn path=/nixos/trunk/; revision=10824
2008-02-22 03:08:26 +00:00
Eelco Dolstra ebea2dafa1 * Quick hack to get the old Apache job working.
svn path=/nixos/trunk/; revision=10785
2008-02-20 17:03:48 +00:00
Eelco Dolstra 50800ad3b5 svn path=/nixos/trunk/; revision=10781 2008-02-20 13:29:08 +00:00
Eelco Dolstra 705c2d36db svn path=/nixos/trunk/; revision=10777 2008-02-20 12:54:17 +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
Eelco Dolstra 8b165fc1f4 * Allow subservices to declare a script that will be run before
the server start.  Useful to initialise necessary state.

svn path=/nixos/trunk/; revision=10761
2008-02-19 17:37:05 +00:00
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