JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,152 Commits 2 Branches 0 Tags 13 GiB
33445eb221
Commit Graph

390 Commits

Author SHA1 Message Date
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
Eelco Dolstra
828305a5ac * Prevent warnings about protocol version 1 being disabled. 
svn path=/nixos/trunk/; revision=11782
 2008-05-08 14:29:00 +00:00
Eelco Dolstra
c44475b085 * Start klogd to send kernel log messages to syslogd. 
svn path=/nixos/trunk/; revision=11781
 2008-05-08 13:47:44 +00:00
Eelco Dolstra
6f64c4ee0d * syslogd: print messages in the local time zone. 
* dhcpd: log to facility "local1".
* syslogd: send "local1" messages to /var/log/dhcpd, and "mail" 
  messages to /var/log/mail.

svn path=/nixos/trunk/; revision=11780
 2008-05-08 12:27:01 +00:00
Eelco Dolstra
5d5f48af83 * Some robots blocks. 
svn path=/nixos/trunk/; revision=11762
 2008-05-06 08:04:28 +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
Michael Raskin
7ee619f83d Typo fix & NameVirtualHost generation 
svn path=/nixos/trunk/; revision=11710
 2008-04-24 18:32:05 +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
Eelco Dolstra
10bdceaaad * Allow disambiguation between the admin scripts of multiple 
Subversion service instances.

svn path=/nixos/trunk/; revision=11701
 2008-04-24 11:42:50 +00:00
Eelco Dolstra
fc236567c2 * Forgot to add (even though the twiki config is not general enough yet). 
svn path=/nixos/trunk/; revision=11700
 2008-04-24 11:40:11 +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
8fd2404adf Lots of fixes to Apache HTTPD configuration. Net result: I can have SSL-only SVN repository on :12443 and SSL-enabled http server with userDirs. 
svn path=/nixos/trunk/; revision=11660
 2008-04-19 10:21:42 +00:00
Michael Raskin
02decddeb1 Added possibility to use names instead of full paths in httpd subservices. Yes, the same dirty hack again 
svn path=/nixos/trunk/; revision=11615
 2008-04-13 09:35:18 +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
10cc22203e * No longer needed. 
svn path=/nixos/trunk/; revision=11538
 2008-04-10 09:14:55 +00:00
Michael Raskin
8c4ebbd24a Some tweaks for Gateway6 job 
svn path=/nixos/trunk/; revision=11496
 2008-04-08 21:41:01 +00:00
Eelco Dolstra
3979844e22 * Purify syslog.conf (it doesn't have to be in /etc). 
svn path=/nixos/trunk/; revision=11436
 2008-04-01 12:50:47 +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
f9cbd6e640 avahi-daemon: Start on `network-interfaces/started'. 
svn path=/nixos/trunk/; revision=11291
 2008-03-26 16:41:31 +00:00
Tobias Hammerschmidt
6ce57e3117 use new ForkDaemon mode (introduced in bitlbee 1.2) instead of Daemon mode 
svn path=/nixos/trunk/; revision=11284
 2008-03-26 07:42:44 +00:00
Marc Weber
3b603a2281 synergyc ip last arg fix 
svn path=/nixos/trunk/; revision=11280
 2008-03-25 00:14:05 +00:00
Marc Weber
0fbd66414a enhanced error reporting missing config attr (new job proposal) 
svn path=/nixos/trunk/; revision=11279
 2008-03-25 00:06:58 +00:00
Michael Raskin
060533c8a1 Fixes to OpenFire 
svn path=/nixos/trunk/; revision=11264
 2008-03-22 17:54:13 +00:00
Eelco Dolstra
3703cd13a2 * Quick hack to make HAL start properly. 
svn path=/nixos/trunk/; revision=11262
 2008-03-22 16:05:01 +00:00
Marc Weber
3afeae0c00 tightvnc service (there might still be some things to improve.. I can run it - has xfs check :) 
svn path=/nixos/trunk/; revision=11243
 2008-03-20 18:34:14 +00:00
Eelco Dolstra
2cc2831563 * Indentation. 
svn path=/nixos/trunk/; revision=11231
 2008-03-20 14:38:49 +00:00
Marc Weber
465a66ab3f renamed newProposal directory 
added two example jobs

svn path=/nixos/trunk/; revision=11146
 2008-03-16 15:52:52 +00:00
Marc Weber
e4757b33b1 removed trace lines, Thanks raskin 
svn path=/nixos/trunk/; revision=11144
 2008-03-16 11:03:03 +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
Sander van der Burg
5005c49e45 Added forgotten documentRoot variable 
svn path=/nixos/trunk/; revision=11081
 2008-03-12 12:21: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
Nicolas Pierron
5240c13bd2 * Enable halting and rebooting with slim. (type halt or reboot as login and the root password) 
svn path=/nixos/trunk/; revision=11040
 2008-03-10 17:27:37 +00:00
Ludovic Courtès
9650b0859e Fix `avahi-daemon' Upstart job. 
svn path=/nixos/trunk/; revision=11002
 2008-03-06 20:56:50 +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
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