Commit graph

437 commits

Author SHA1 Message Date
Nicolas Pierron f824a1e753 Added rogue job used by CD
svn path=/nixos/branches/fix-style/; revision=14159
2009-02-22 16:06:47 +00:00
Nicolas Pierron b1eabe2b1b An upstart job to display manual
svn path=/nixos/branches/fix-style/; revision=14158
2009-02-22 16:06:42 +00:00
Nicolas Pierron ecc761543c Remove name argument of merge functions.
svn path=/nixos/branches/fix-style/; revision=13860
2009-01-25 15:49:23 +00:00
Nicolas Pierron dcc981840e Use the mergeOneOption function instead of duplicated code.
svn path=/nixos/branches/fix-style/; revision=13859
2009-01-25 15:49:18 +00:00
Nicolas Pierron b2b6f92d6b Split xserver upstart job into:
- xserver configuration & job
- display manager (slim)
- window manager (compiz, kwm, metacity, twm, wmii, xmonad)
- desktop manager (kde, gnome, xterm)

Added features:
- Add WM choice in slim (with F1)

svn path=/nixos/branches/fix-style/; revision=13857
2009-01-25 15:49:08 +00:00
Nicolas Pierron fa3437cb35 Remove enableIntel* and enableGo7007 options.
Update nixos-hardware-scan.pl to generate files without these options.

svn path=/nixos/branches/fix-style/; revision=13856
2009-01-25 15:48:59 +00:00
Nicolas Pierron 67edd3720f Update argument syntax of configuration files.
svn path=/nixos/branches/fix-style/; revision=13852
2009-01-25 15:48:39 +00:00
Nicolas Pierron 08280c415f Add support for wmii.
svn path=/nixos/branches/fix-style/; revision=13850
2009-01-25 15:48:30 +00:00
Nicolas Pierron b92036e803 Fetch the windows manager pid.
svn path=/nixos/branches/fix-style/; revision=13849
2009-01-25 15:48:25 +00:00
Nicolas Pierron 7aa27dfee2 Merge branches 'fix-style' and 'master' into fix-style
svn path=/nixos/branches/fix-style/; revision=13688
2009-01-02 19:41:39 +00:00
Nicolas Pierron d745c21aab Merge system/fontdir.nix and system/fonts.nix into a new configuration file.
svn path=/nixos/branches/fix-style/; revision=13686
2009-01-02 16:07:39 +00:00
Nicolas Pierron 1b32260084 Convert "upstart-jobs/xserver.nix" to a configuration file.
svn path=/nixos/branches/fix-style/; revision=13682
2009-01-02 16:07:21 +00:00
Nicolas Pierron 79bfab0e07 convert "upstart-jobs/atd.nix" to a configuration file. Remove extra occurrences of "atd" from other files.
svn path=/nixos/branches/fix-style/; revision=13680
2009-01-02 16:07:10 +00:00
Nicolas Pierron c787cb1a0a Replace job tags by a library of function to build upstart jobs.
svn path=/nixos/branches/fix-style/; revision=13674
2009-01-02 16:06:41 +00:00
Nicolas Pierron b47e6675b8 Use generated upstart-job's tags for cron.
svn path=/nixos/branches/fix-style/; revision=13593
2008-12-07 12:27:46 +00:00
Nicolas Pierron 2f0e8e370a Update argument style.
svn path=/nixos/branches/fix-style/; revision=13584
2008-12-04 15:48:27 +00:00
Nicolas Pierron 1236cf61f4 replace ifEnable by mkIf and mkThenElse.
svn path=/nixos/branches/fix-style/; revision=13382
2008-11-23 01:29:25 +00:00
Nicolas Pierron 157bb2b71a Convert "alsa" upstart-job to the fix-style.
svn path=/nixos/branches/fix-style/; revision=13379
2008-11-23 01:29:05 +00:00
Nicolas Pierron 9c0eef3bae Convert "dbus" & "avahi-deamon" upstart-job to the fix-style.
svn path=/nixos/branches/fix-style/; revision=13378
2008-11-23 01:28:58 +00:00
Nicolas Pierron dc634f5297 Convert "hal" upstart-job to the fix-style.
svn path=/nixos/branches/fix-style/; revision=13377
2008-11-23 01:28:52 +00:00
Nicolas Pierron 585fd9d911 Convert "gpm" upstart-job to the fix-style.
svn path=/nixos/branches/fix-style/; revision=13376
2008-11-23 01:28:45 +00:00
Nicolas Pierron afe160c6b2 Convert "nagios" upstart-job to the fix-style.
svn path=/nixos/branches/fix-style/; revision=13375
2008-11-23 01:28:34 +00:00
Nicolas Pierron a63ea50ee9 Fix zabbix-server.nix.
svn path=/nixos/branches/fix-style/; revision=13374
2008-11-23 01:28:25 +00:00
Nicolas Pierron 9c751d377d Use the new scheme for zabbix upstart-job.
svn path=/nixos/branches/fix-style/; revision=13329
2008-11-18 18:00:21 +00:00
Nicolas Pierron 3a25babf1b Use the new scheme for disnix upstart-job.
svn path=/nixos/branches/fix-style/; revision=13328
2008-11-18 18:00:15 +00:00
Nicolas Pierron 892d12bccf - Move some system configuration to options:
* system.nssModules
  * system.modulesTree
  * system.sbin.modprobe
  * system.sbin.mount
  * nix.envVars

- Remove Arguments that can be accessed either by "config" or "pkgs".

- Use the new scheme for upstart-jobs/default.nix.
This is now a configuration file which is imported by system/options.nix.

- Jobs can now include upstart-job/default.nix:
  * upstrat-jobs/cron.nix
  * upstart-jobs/dhclient.nix

=> No Nixos file refers to upstart-jobs/default.nix except if one of its options is require to define an extra job. (e.g.: cron, dhclient)

svn path=/nixos/branches/fix-style/; revision=13327
2008-11-18 18:00:09 +00:00
Nicolas Pierron 2ed34fae67 Extract "locate" job from the "cron" job.
svn path=/nixos/trunk/; revision=13236
2008-11-09 16:44:53 +00:00
Nicolas Pierron 866987a60e cron.nix: Use the new option scheme.
svn path=/nixos/trunk/; revision=13235
2008-11-09 16:44:43 +00:00
Nicolas Pierron b73a579d18 Fix previous commit.
svn path=/nixos/trunk/; revision=13229
2008-11-08 21:45:58 +00:00
Nicolas Pierron 4a55f02005 "dhclient.nix" is now a self-contained job.
svn path=/nixos/trunk/; revision=13228
2008-11-08 21:32:48 +00:00
Eelco Dolstra 1573bdddfb * CUPS: enabled support for printing via SMB.
svn path=/nixos/trunk/; revision=13218
2008-11-07 13:37:28 +00:00
Michael Raskin c76632804c meta.function -> passthru.function
svn path=/nixos/trunk/; revision=13191
2008-11-04 21:24:58 +00:00
Eelco Dolstra f549ee6009 * Always add "iceauth" to the PATH (not just when sessionType ==
"kde") so that KDE applications work even when not running KDE.

svn path=/nixos/trunk/; revision=13154
2008-10-29 16:15:58 +00:00
Marc Weber 32b263e429 added system cron mailto option
svn path=/nixos/trunk/; revision=13114
2008-10-25 22:03:12 +00:00
Michael Raskin 1d55390e1c An option for XRandr support. Use it for dualhead ATi (and probably Intel) cards.
svn path=/nixos/trunk/; revision=13109
2008-10-24 10:30:38 +00:00
Marc Weber a99b82b987 Misspelling the video driver name results in a thrown message now
small refactorings, list of known drivers is an attr set, optional is imported from lib etc

svn path=/nixos/trunk/; revision=13048
2008-10-10 16:45:56 +00:00
Eelco Dolstra 5ea24925b5 * Use Subversion 1.5.
svn path=/nixos/trunk/; revision=12980
2008-10-06 23:02:20 +00:00
Eelco Dolstra ec1d1ef851 * Urgh, there's got to be a more generic way of dealing
with the Python version...

svn path=/nixos/trunk/; revision=12972
2008-10-06 13:40:14 +00:00
Marc Weber 77d1d30e97 doh, removed debug statement and superfluous wrong character
svn path=/nixos/trunk/; revision=12862
2008-09-14 13:29:09 +00:00
Marc Weber ca031ce720 httpd.extraModules: now accpets string items loading modules beeing distributed by apache
removed pkgs : arg

svn path=/nixos/trunk/; revision=12861
2008-09-14 01:30:45 +00:00
Eelco Dolstra d5da3185fe svn path=/nixos/trunk/; revision=12853 2008-09-12 16:31:39 +00:00
Ludovic Courtès e15ffa9e3c Add `gnunetd' Upstart job.
svn path=/nixos/trunk/; revision=12802
2008-09-04 20:28:02 +00:00
Eelco Dolstra ab80a34ea4 * Quick workaround for tty-backgrounds not working on Linux 2.6.26:
/proc/sys/kernel/fbcondecor is now suddenly named /proc/sys/fbcondecor.
  Might be a bug.

svn path=/nixos/trunk/; revision=12784
2008-09-02 09:51:44 +00:00
Michael Raskin 0d3cee6247 Typo fixed
svn path=/nixos/trunk/; revision=12757
2008-08-27 21:22:49 +00:00
Nicolas Pierron 6e6f867a0a Add pcmcia job.
Test the new option style.

svn path=/nixos/trunk/; revision=12742
2008-08-27 14:01:17 +00:00
Eelco Dolstra 1e33c98258 * Doh.
svn path=/nixos/trunk/; revision=12737
2008-08-27 10:06:25 +00:00
Eelco Dolstra 618b726542 * Don't put the Adobe bitmap fonts in the fontconfig search path
because then Helvetica looks horrible.

svn path=/nixos/trunk/; revision=12736
2008-08-27 10:00:49 +00:00
Sander van der Burg 545406b2e2 Added support for ejabberd virtualhosts
svn path=/nixos/trunk/; revision=12648
2008-08-18 14:48:55 +00:00
Sander van der Burg fdc362a726 Fixed a very stupid bug
svn path=/nixos/trunk/; revision=12611
2008-08-13 09:44:40 +00:00
Sander van der Burg c5fea583e2 Added disnix hook options
svn path=/nixos/trunk/; revision=12596
2008-08-12 13:16:12 +00:00
Sander van der Burg 4c3627f16e Added CATALINA_OPTS parameter
svn path=/nixos/trunk/; revision=12588
2008-08-11 21:35:45 +00:00
Eelco Dolstra ffe45949e8 * Use the right mount command in the filesystems job so that
NTFS-3G works properly.

svn path=/nixos/trunk/; revision=12565
2008-08-09 12:03:08 +00:00
Eelco Dolstra b760a4b8d9 * Use the persistent storage udev rules in the initrd so that we can
use /dev/disk/by-{label,id,...} names for the root FS.
* Kill udevd at the end of stage 1.  Don't know how it got killed
  previously...

svn path=/nixos/trunk/; revision=12560
2008-08-08 22:44:45 +00:00
Nicolas Pierron 2e9dc1ea47 Rename option: services.xserver.packageFun -> .package
svn path=/nixos/trunk/; revision=12553
2008-08-08 18:57:11 +00:00
Nicolas Pierron 51210b1904 Remove pkgs argument of:
- boot.kernelPackages
- boot.extraModulePackages
- services.xserver.packageFun (should be renamed)
- fonts.extraFonts
- environment.extraPackages
- environment.nix

These options still accept the previous style.

svn path=/nixos/trunk/; revision=12551
2008-08-08 18:57:07 +00:00
Michael Raskin b8ff944cd2 Postfix list separator fix
svn path=/nixos/trunk/; revision=12548
2008-08-08 18:51:32 +00:00
Michael Raskin 014b33637c Added an option to easily allow everyone to use "at".
svn path=/nixos/trunk/; revision=12531
2008-08-07 10:09:17 +00:00
Nicolas Pierron 791d8bbc66 Add udev extra option (addUdevPkgs).
Add some merge functions.

svn path=/nixos/trunk/; revision=12523
2008-08-06 19:26:47 +00:00
Sander van der Burg f652a0836a Added support for custom context.xml
svn path=/nixos/trunk/; revision=12513
2008-08-06 15:07:29 +00:00
Sander van der Burg afdfff7ed8 Added common lib support for tomcat
svn path=/nixos/trunk/; revision=12511
2008-08-06 13:41:08 +00:00
Michael Raskin cb8067cdb5 More configuratbility for vsFTPd upstart job.
svn path=/nixos/trunk/; revision=12472
2008-08-04 09:36:11 +00:00
Eelco Dolstra e40d6858d9 * udev: create symlinks /dev/{cd,dvd,cdrw,dvdrw}.
svn path=/nixos/trunk/; revision=12456
2008-07-31 14:13:35 +00:00
Eelco Dolstra 5ec1fa2060 * Tabs considered harmful.
svn path=/nixos/trunk/; revision=12407
2008-07-23 14:13:27 +00:00
Ludovic Courtès 8eb0444ab8 lshd: Explicitly pass all options to the daemon.
svn path=/nixos/trunk/; revision=12319
2008-07-08 07:24:28 +00:00
Sander van der Burg 6a2600c0a2 Added some more features to the tomcat service
svn path=/nixos/trunk/; revision=12284
2008-07-06 19:55:34 +00:00
Sander van der Burg 82ddadc27c Added disnix service
svn path=/nixos/trunk/; revision=12283
2008-07-06 18:34:19 +00:00
Sander van der Burg 045ae06092 Updated ejabberd service to make it work
svn path=/nixos/trunk/; revision=12270
2008-07-06 10:30:53 +00:00
Sander van der Burg 7813be5e54 Updated tomcat service with a more sophisticated model
svn path=/nixos/trunk/; revision=12268
2008-07-05 22:27:36 +00:00
Michael Raskin 2c56d137ee I hope that hardwareScan = false now works as expected again...
svn path=/nixos/trunk/; revision=12253
2008-07-03 18:54:16 +00:00
Eelco Dolstra 6ed65c2d95 * Removing hardware-scan.nix also removed the loading of the
kernel modules listed in config.boot.kernelModules.  So do
  that in the udev job for lack of a better place.

svn path=/nixos/trunk/; revision=12249
2008-07-03 10:45:14 +00:00
Eelco Dolstra 5f60393ffe * Let udev call modprobe to load modules for all known hardware. This
makes the `hardware-scan' job unnecessary.  (In fact the new
  approach appears to be more thorough; it loads some drivers that
  were not previously loaded.)

svn path=/nixos/trunk/; revision=12248
2008-07-02 21:19:04 +00:00
Eelco Dolstra 96cfd4105e * Revert accidental commit.
svn path=/nixos/trunk/; revision=12247
2008-07-02 21:16:29 +00:00
Eelco Dolstra 49b9662e31 * Use most of the default rules from the udev distribution
rather than supplying our own (less maintenance...).
  This takes care, among other things, of populating
  /dev/disk, which is useful.

svn path=/nixos/trunk/; revision=12246
2008-07-02 18:06:34 +00:00
Eelco Dolstra ed1029092b * Udev jobs can now declare a passthru attribute which is
useful for testing the building of specific parts of
  a service, e.g. you can do
  
    $ nix-build /etc/nixos/nixos/ -A upstartJobs.udev.passthru.udevRules

  to build the udev rules directory of the udev service.

svn path=/nixos/trunk/; revision=12243
2008-07-02 18:02:24 +00:00
Michael Raskin 4d0645acb1 Fixed authoritative zone ACL, enabled IPv6
svn path=/nixos/trunk/; revision=12234
2008-07-01 12:31:47 +00:00
Michael Raskin 7699aaad79 Added BIND
svn path=/nixos/trunk/; revision=12233
2008-07-01 12:15:56 +00:00
Michael Raskin 700fa49f93 Separate dovecot log
svn path=/nixos/trunk/; revision=12232
2008-07-01 10:50:38 +00:00
Eelco Dolstra eaf6b8eb18 * udevtrigger / udevsettle -> udevadm.
svn path=/nixos/trunk/; revision=12229
2008-07-01 08:28:56 +00:00
Michael Raskin fc877a99a7 Silly mistake fixed - chowned maildirs on start
svn path=/nixos/trunk/; revision=12225
2008-06-30 21:34:41 +00:00
Michael Raskin 2025d58c2a At least dovecot and postfix work together and with Thunderbird
svn path=/nixos/trunk/; revision=12223
2008-06-30 21:12:02 +00:00
Michael Raskin eb79938997 Added Postfix; handles at least local delivery with maildir/
svn path=/nixos/trunk/; revision=12221
2008-06-30 15:13:02 +00:00
Michael Raskin 60d37c75f9 Added radeonhd support to xserver job
svn path=/nixos/trunk/; revision=12206
2008-06-28 07:46:50 +00:00
Eelco Dolstra 90acbf9509 * mysql: merged the mysql expression in the services tree.
* mysql: run under a separate user ("mysql"), not under "nobody".
* mysql: put the PID under /var/run.

svn path=/nixos/trunk/; revision=12189
2008-06-25 21:58:51 +00:00
Eelco Dolstra 91e2083d32 * Load the wis-go7007 firmware automatically.
svn path=/nixos/trunk/; revision=12170
2008-06-20 16:10:20 +00:00
Eelco Dolstra 1ec810f844 * Clean up indentation.
svn path=/nixos/trunk/; revision=12169
2008-06-20 16:09:48 +00:00
Eelco Dolstra d28ecc593f * hal: less verbosity.
svn path=/nixos/trunk/; revision=12031
2008-06-10 16:15:37 +00:00
Eelco Dolstra a20f4aff60 * Updated the splash screen support for Linux >= 2.6.25.
svn path=/nixos/trunk/; revision=12030
2008-06-10 16:10:23 +00:00
Eelco Dolstra a49eb4d1f9 * extraSubservices: renamed serviceName' to serviceType' which is more
correct.

svn path=/nixos/trunk/; revision=12026
2008-06-09 16:41:41 +00:00
Eelco Dolstra 5235acb1d7 * extraSubservices: the subservice config no longer needs to be
in a `config' attribute.  So instead of

    extraSubservices = [
      { serviceName = "foo";
        config = {
          bla = ...;
        };
      }
    ];

  you can write

    extraSubservices = [
      { serviceName = "foo";
        bla = ...;
      }
    ];

svn path=/nixos/trunk/; revision=12024
2008-06-09 16:35:24 +00:00
Eelco Dolstra f17f9e301f svn path=/nixos/trunk/; revision=12023 2008-06-09 16:02:38 +00:00
Eelco Dolstra deaf99ca92 * Added a subservices for the Zabbix PHP frontend.
* Apache subservices: missing declarations are filled in with defaults.

svn path=/nixos/trunk/; revision=12022
2008-06-09 15:52:02 +00:00
Eelco Dolstra 0b068f504c * Less verbosity.
svn path=/nixos/trunk/; revision=12017
2008-06-09 11:14:43 +00:00
Eelco Dolstra 6d380a8ce8 * Option to set the Zabbix server IP.
svn path=/nixos/trunk/; revision=12012
2008-06-08 22:21:56 +00:00
Eelco Dolstra b8aa6c6f31 svn path=/nixos/trunk/; revision=12001 2008-06-06 12:38:40 +00:00
Eelco Dolstra 96a8dbfd58 * Upstart jobs for the Zabbix agent and server daemons.
svn path=/nixos/trunk/; revision=11998
2008-06-06 09:13:16 +00:00
Sander van der Burg 33aae3136a Make old http service working again
svn path=/nixos/trunk/; revision=11956
2008-06-03 13:30:37 +00:00
Michael Raskin eff945115b Added gpm service
svn path=/nixos/trunk/; revision=11952
2008-06-03 07:06:35 +00:00
Michael Raskin da13d7ed13 Fixed instantiation errors after kernel changes...
svn path=/nixos/trunk/; revision=11886
2008-05-23 06:40:16 +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 b5451023a2 Applied patch sent by justbeingglad long ago..
svn path=/nixos/trunk/; revision=11833
2008-05-16 07:32:00 +00:00