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

340 Commits

Author SHA1 Message Date
Eelco Dolstra
051e9342b3 * Use the moduli file. This shuts up the "WARNING: /etc/ssh/moduli 
does not exist, using fixed modulus" message in /var/log/messages.

svn path=/nixos/trunk/; revision=19754
 2010-02-01 17:05:02 +00:00
Marco Maggesi
86b42fdfbf Fix bugs and improve modules/services/network-filesystems/openafs-client 
svn path=/nixos/trunk/; revision=19751
 2010-02-01 16:29:15 +00:00
Ludovic Courtès
06aeb7d87f GNUnet: Add options; add as a system package; provide /etc/gnunetd.conf. 
svn path=/nixos/trunk/; revision=19630
 2010-01-23 15:47:33 +00:00
Eelco Dolstra
50430f19e1 * Only run dhclient on interfaces of type 1, otherwise it fails to 
start if the machine has weird network devices (e.g. "eql").

svn path=/nixos/trunk/; revision=19623
 2010-01-22 20:34:32 +00:00
Lluís Batlle i Rossell
d45a3fbdc9 Adding the pcscd daemon (this daemon manages smartcard reader drivers), and offers 
a common interface to programs dealing with smartcards (like users of the opensc lib).


svn path=/nixos/trunk/; revision=19360
 2010-01-11 21:56:01 +00:00
Eelco Dolstra
ee005424bf * Doh, subtle race condition: STARTUP must be cleared after "udevadm 
settle".  Otherwise some rules may be processed with STARTUP
  cleared, causing LVM devices not to be created.

svn path=/nixos/trunk/; revision=19341
 2010-01-10 20:08:35 +00:00
Eelco Dolstra
6f8a3ba7c7 * Create devicemapper/lvm device nodes from udev (using the rules 
supplied by the lvm package).  This makes the "lvm" Upstart task
  unnecessary.  Also, we now get /dev/disk/by-{label,uuid} symlinks
  for LVM logical disks.

svn path=/nixos/trunk/; revision=19300
 2010-01-07 22:39:35 +00:00
Lluís Batlle i Rossell
fa2a6f835f Adding wicd, taking in the patch sent by roconnor to nix-dev on 2010-01-07. 
svn path=/nixos/trunk/; revision=19298
 2010-01-07 17:53:03 +00:00
Marc Weber
fdc63c54e4 enhance phpIni documentation 
readd r19267 (the issue should be fixed now)

Eelco Dolstra and Nicolas Pierron both kept asking me to pay attention
to the rendered manual. There is one catch: example settings such as
pkgs.kernelPackages_2_6_25 are correct however they don't render
properly. Moreover you don't want those examples to be evaluated (maybe
compiling a kernel ?) when building the manual only.
So use Strings and add a copy & paste note.
This is still a hacky. Maybe a kind of typed "verbatim" expression
should be added (?)

svn path=/nixos/trunk/; revision=19281
 2010-01-07 09:01:40 +00:00
Eelco Dolstra
ac7c404deb * Revert r19267 - it causes a corrupt Apache Upstart job to be 
generated.  E.g. in
  http://hydra.nixos.org/build/208321/nixlog/8/raw:

    webserver# init:/etc/init/httpd.conf:14: Unexpected token

svn path=/nixos/trunk/; revision=19280
 2010-01-06 23:37:30 +00:00
Marc Weber
99644df67a customizable PHPRC 
svn path=/nixos/trunk/; revision=19267
 2010-01-06 17:05:57 +00:00
Eelco Dolstra
73668f41da * Added an "auto" pseudo display manager that logs in a user 
automatically.  This is mostly useful for testing.  (KDM also has
  this feature, but it's nice not to depend on KDE for non-KDE tests.)

svn path=/nixos/trunk/; revision=19239
 2010-01-05 15:32:14 +00:00
Eelco Dolstra
62476f2816 * Added a module for IceWM. 
svn path=/nixos/trunk/; revision=19238
 2010-01-05 15:30:56 +00:00
Marc Weber
c0c4d575d2 autofs job fixes: 
use exec so that upstart knows when automount shuts down.
If a mount is used upstart will send SIGKILL.
Automount doesn't clean up. So unmount everything using a post script.

svn path=/nixos/trunk/; revision=19105
 2009-12-25 06:39:43 +00:00
Lluís Batlle i Rossell
aaac043ae5 Making an explicit dependency for nfs-kernel on portmap 
svn path=/nixos/trunk/; revision=19090
 2009-12-24 12:05:34 +00:00
Eelco Dolstra
9c465fedfa * Reinstate the -s flag. 
svn path=/nixos/trunk/; revision=19055
 2009-12-20 22:03:32 +00:00
Eelco Dolstra
57f70db611 * Revert r19003 for now, because wpa_supplicant 0.6.9 (in the Nixpkgs 
trunk) doesn't have a -s flag.  0.7.0 in the stdenv branch
  presumably does, but it's marked as unstable upstream.

svn path=/nixos/trunk/; revision=19047
 2009-12-20 16:51:22 +00:00
Lluís Batlle i Rossell
3f6ca96967 Adding an option to disable nscd. 
svn path=/nixos/trunk/; revision=19004
 2009-12-16 20:51:25 +00:00
Lluís Batlle i Rossell
ee434cc3d6 Using wpa_supplicant feature to log to syslog, instead of stdout (which, 
in the actual upstart job, meant /dev/console)

svn path=/nixos/trunk/; revision=19003
 2009-12-16 19:45:19 +00:00
Lluís Batlle i Rossell
4e8270f695 Upstart considers that syslog is ready (runs openlog()) 
after the connection to dbus worked.
So I set dbus depend also on syslogd.

svn path=/nixos/trunk/; revision=19002
 2009-12-16 19:45:11 +00:00
Rob Vermaas
48d5ea1077 mysql.mysql becomes mysql.package because eelco likes it better 
svn path=/nixos/trunk/; revision=18994
 2009-12-16 15:24:15 +00:00
Rob Vermaas
52284859c5 * allow configuration of mysql version 
svn path=/nixos/trunk/; revision=18993
 2009-12-16 14:54:36 +00:00
Michael Raskin
b628ca221d Fix Monit upstart dependency 
svn path=/nixos/trunk/; revision=18964
 2009-12-15 13:32:10 +00:00
Ludovic Courtès
3f2348ef91 Start networking services on `ip-up' when it makes sense. 
svn path=/nixos/trunk/; revision=18962
 2009-12-15 13:02:23 +00:00
Rob Vermaas
fe490f2edc * mysql-backup: option for which user to use for performing backups 
svn path=/nixos/trunk/; revision=18942
 2009-12-14 17:57:37 +00:00
Marc Weber
4d7e344f69 Adding initial version of the nixos cd insallation test script using 
qemu_kvm. Installation doesn't take place yet. VM is started
printing a remote controlled "Hello".

This serves as example how to run a vm within a bulid job.

svn path=/nixos/trunk/; revision=18887
 2009-12-11 00:51:13 +00:00
Rob Vermaas
038180bab8 * sshd.nix: ports attribute, to allow listening to multiple ports 
svn path=/nixos/trunk/; revision=18877
 2009-12-10 14:45:41 +00:00
Eelco Dolstra
9682f0ed90 svn path=/nixos/trunk/; revision=18872 2009-12-10 09:22:45 +00:00
Lluís Batlle i Rossell
60b856b115 Adding a module for system health monitoring (getting graphs generated by rrdtool 
of usual system counters).
It sets up some cron jobs for collecting the data, and not that often, generating the
graphs. Then the httpd server is configured with a directory with the generated
static files.

http://www.brianlane.com/software/systemhealth/

svn path=/nixos/trunk/; revision=18866
 2009-12-09 21:45:59 +00:00
Lluís Batlle i Rossell
b005e22952 Adding a not-very-nice option to allow setting the wpa_supplicant interface. 
(eth1 in my PC, instead of the previously hardcoded wlan0)

svn path=/nixos/trunk/; revision=18862
 2009-12-09 20:30:40 +00:00
Nicolas Pierron
05c23802bb Fix synergy client. 
* Add serverAddress option.
* Evaluate the client daemon in foreground, otherwise upstart get the hand
  and tries to restart it.

svn path=/nixos/trunk/; revision=18799
 2009-12-04 12:50:49 +00:00
Nicolas Pierron
f4a6f9e84b * Add options to handle automatic calls to the garbage collector. 
These options avoid manual references to pkgs.nixUnstable which might be
  changed with environment.nix option.

svn path=/nixos/trunk/; revision=18798
 2009-12-04 12:50:44 +00:00
Eelco Dolstra
4eabed3f0f * Support short URLs (http://server/wiki/Page instead of 
http://server/w/index.php?title=Page).

svn path=/nixos/trunk/; revision=18783
 2009-12-03 13:34:36 +00:00
Eelco Dolstra
aacd16cff0 * Make various MediaWiki scripts available in $PATH, 
e.g. mediawiki-<id>-changePassword (where <id> is usually "main").

svn path=/nixos/trunk/; revision=18780
 2009-12-03 12:20:24 +00:00
Eelco Dolstra
9f8fc09fc3 * Create a user "mediawiki" and give root and wwwrun ident-based 
access.

svn path=/nixos/trunk/; revision=18779
 2009-12-03 11:56:03 +00:00
Eelco Dolstra
c7e0a7b31c * Make it configurable. 
svn path=/nixos/trunk/; revision=18778
 2009-12-03 08:44:54 +00:00
Eelco Dolstra
81c3454cdb * Allow Mediawiki (and other PHP applications) to send email through 
the `sendmail' command (i.e. ssmtp).  This is hacky - there should
  be some global config value that specifies the path to sendmail,
  which the ssmtp module and others can then set.

svn path=/nixos/trunk/; revision=18777
 2009-12-03 08:25:16 +00:00
Eelco Dolstra
f99d9b0658 * Basic MediaWiki module. Thanks to Dario Vodopivec, Milan Seneši and 
Nasir Shadravan.

svn path=/nixos/trunk/; revision=18769
 2009-12-02 17:59:17 +00:00
Eelco Dolstra
d29072d214 * Generate a postgresql.conf and use it to specify the paths to 
pg_hba.conf and pg_ident.conf.
* Turn on syslog logging for PostgreSQL.

svn path=/nixos/trunk/; revision=18768
 2009-12-02 17:18:25 +00:00
Marco Maggesi
729bf2e2f0 Fix wrong upstart directives in openafs-client 
svn path=/nixos/trunk/; revision=18645
 2009-11-26 14:12:19 +00:00
Marco Maggesi
7cefe762db Fix openafs-client for the new Upstart 0.6 
svn path=/nixos/trunk/; revision=18644
 2009-11-26 13:11:56 +00:00
Eelco Dolstra
ed6daf4ea4 * Doh! I lost ${flags} somewhere along the way, so Postgres 
wouldn't get the -i option anymore...

svn path=/nixos/branches/upstart-0.6/; revision=18606
 2009-11-24 17:07:23 +00:00
Eelco Dolstra
a21f18e81f * Synced with the trunk. 
svn path=/nixos/branches/upstart-0.6/; revision=18602
 2009-11-24 16:11:01 +00:00
Eelco Dolstra
e76f14714b svn path=/nixos/trunk/; revision=18599 2009-11-24 15:05:08 +00:00
Eelco Dolstra
88b26c47ad * Run cronjobs with a more userfriendly $PATH. 
svn path=/nixos/trunk/; revision=18595
 2009-11-24 14:20:33 +00:00
Sander van der Burg
ff177a01a7 Fixed ejabberd service so that it will be started on startup 
svn path=/nixos/branches/upstart-0.6/; revision=18557
 2009-11-23 13:29:47 +00:00
Sander van der Burg
7fc40ca2f1 Enabled startOn event of the MySQL and Tomcat server so that they are initialised on startup 
svn path=/nixos/branches/upstart-0.6/; revision=18556
 2009-11-23 13:26:33 +00:00
Michael Raskin
69a2842d01 Switch off one of the two conflicting on-by-default options 
svn path=/nixos/trunk/; revision=18519
 2009-11-22 14:34:53 +00:00
Ludovic Courtès
1966f9d297 Hopefully really fix the OpenSSH/GnuPG agent assertion (yes!). 
svn path=/nixos/trunk/; revision=18517
 2009-11-22 00:54:01 +00:00
Ludovic Courtès
d912b510f5 Hopefully really fix the OpenSSH/GnuPG agent assertion. 
svn path=/nixos/trunk/; revision=18516
 2009-11-22 00:46:37 +00:00
Ludovic Courtès
ab3332a2eb Rename startSSHAgent' to startOpenSSHAgent'. 
svn path=/nixos/trunk/; revision=18515
 2009-11-22 00:40:53 +00:00
Ludovic Courtès
8c349a9e71 Fix the OpenSSH/GnuPG agent assertion. 
svn path=/nixos/trunk/; revision=18514
 2009-11-22 00:40:48 +00:00
Ludovic Courtès
66d8af6d09 X: Add support for starting the GnuPG agent. 
svn path=/nixos/trunk/; revision=18509
 2009-11-21 22:14:01 +00:00
Sander van der Burg
2c8d2c2268 Small bugfix which automatically creates tomcat configuration dirs. Otherwise the startup would fail 
svn path=/nixos/branches/upstart-0.6/; revision=18488
 2009-11-20 16:20:57 +00:00
Sander van der Burg
ebbde6f8d3 Added directory option for ejabberd dumps so that we can use derivations on a convenient way, e.g. loadDumps = [ myDumpDrvFun ]; 
svn path=/nixos/branches/upstart-0.6/; revision=18487
 2009-11-20 15:35:01 +00:00
Sander van der Burg
dd0f8b36d5 Moved ejabberd initialization check loop inside the if statement, since we only have to check for it in the first startup 
svn path=/nixos/branches/upstart-0.6/; revision=18464
 2009-11-19 15:17:04 +00:00
Sander van der Burg
9b000b3dcf Added loadDumps option, which makes it possible to load a specific ejabberd configuration on the first startup 
svn path=/nixos/branches/upstart-0.6/; revision=18461
 2009-11-19 15:12:05 +00:00
Sander van der Burg
a5cdfcbdb2 Removed the dirty sleep hack from the ejabberd service 
svn path=/nixos/branches/upstart-0.6/; revision=18456
 2009-11-19 13:15:15 +00:00
Sander van der Burg
e171b6d86e Added option to specify directories as a path for MySQL database schemas. 
By using this approach we no longer have to specify schemas like this:

schema = "${myDatabaseSchemaDrvFun}/prefix/to/the/sqlfile.sql";

but like this:

schema = myDataBaseSchemaDrv;

which is in some cases more convenient.


svn path=/nixos/branches/upstart-0.6/; revision=18450
 2009-11-18 21:56:47 +00:00
Sander van der Burg
27d0d2927e Added initialDatabases option to the MySQL service. This is useful for e.g. automatically intialing databases in a test VM 
svn path=/nixos/branches/upstart-0.6/; revision=18437
 2009-11-18 16:19:04 +00:00
Michael Raskin
ea2417ac87 Apply Eelco Dolstra's formatting suggestions 
svn path=/nixos/trunk/; revision=18436
 2009-11-18 15:11:54 +00:00
Michael Raskin
26f83d65e4 Adding GVPE service 
svn path=/nixos/trunk/; revision=18431
 2009-11-18 14:54:37 +00:00
Sander van der Burg
6d11d63ba3 Removed the nasty sleep hack of tomcat, since upstart-0,6 is also capable of only executing start and stop scripts 
svn path=/nixos/branches/upstart-0.6/; revision=18430
 2009-11-18 14:50:48 +00:00
Marco Maggesi
58b3476dfc Automatic download of CellServDB for OpenAFS client. 
svn path=/nixos/trunk/; revision=18417
 2009-11-18 13:28:16 +00:00
Eelco Dolstra
aa9d0a067e * Sync with the trunk. 
svn path=/nixos/branches/upstart-0.6/; revision=18408
 2009-11-18 11:50:06 +00:00
Michael Raskin
ddc5a7d7c5 Oops, placed mkIf in the wrong place. Fixing 
svn path=/nixos/trunk/; revision=18402
 2009-11-18 09:30:38 +00:00
Michael Raskin
a94da97354 Make monit actually switchable off 
svn path=/nixos/trunk/; revision=18401
 2009-11-18 09:29:43 +00:00
Michael Raskin
1a05efa66a Adding Monit - one more service to watch system.. 
svn path=/nixos/trunk/; revision=18399
 2009-11-18 08:39:10 +00:00
Eelco Dolstra
e9b2ef9fb7 * Restart wpa_supplicant and dhclient on resume. 
svn path=/nixos/branches/upstart-0.6/; revision=18360
 2009-11-15 20:40:41 +00:00
Eelco Dolstra
0755e228bf * Since "initctl stop" is now synchronous, the sleep is no longer 
needed.

svn path=/nixos/branches/upstart-0.6/; revision=18359
 2009-11-15 20:40:07 +00:00
Eelco Dolstra
56d817b0b0 * X server: remove the udev hack. 
svn path=/nixos/branches/upstart-0.6/; revision=18358
 2009-11-15 20:38:19 +00:00
Eelco Dolstra
1affc9168e * Move power management configuration into a separate module from 
the acpid service.
* Add a pm-utils hook to allow commands to be executed when the system
  suspends/resumes etc.

svn path=/nixos/branches/upstart-0.6/; revision=18353
 2009-11-15 12:48:42 +00:00
Sander van der Burg
4af37a0994 VirtualBox Xorg driver needs xrefresh, so added it to the environment when using the virtualbox driver 
svn path=/nixos/trunk/; revision=18322
 2009-11-10 15:25:50 +00:00
Marco Maggesi
4bc162df4c Add configurations for package OpenAFS (added forgotten files) 
svn path=/nixos/trunk/; revision=18321
 2009-11-10 15:22:57 +00:00
Eelco Dolstra
d1bbe706a2 * Synced with the trunk. 
svn path=/nixos/branches/upstart-0.6/; revision=18297
 2009-11-08 21:27:53 +00:00
Nicolas Pierron
616c844336 * Move the default value of videoDrivers into the default field of the 
option.  Otherwise, the system may depends on unused/unsupported
  softwares and users will be force to use properties in their
  configuration.nix file to override this default value. (too complex for
  new users)

svn path=/nixos/trunk/; revision=18288
 2009-11-08 16:01:22 +00:00
Wouter den Breejen
b0ba17873c Fixed hash replace with a variable to the real hash 
svn path=/nixos/trunk/; revision=18268
 2009-11-07 21:03:57 +00:00
Eelco Dolstra
d9d072a89b * Improve the mysql shutdown. 
svn path=/nixos/branches/upstart-0.6/; revision=18255
 2009-11-07 12:43:32 +00:00
Eelco Dolstra
7aecd0ca53 * hal: depend on both dbus and acpid (if enabled). 
* dbus: don't signal Upstart, since that seems to make it forget about
  pending events or something.  In any case starting dbus after acpid
  was running wouldn't trigger hal to be started (but the other way
  around did work).

svn path=/nixos/branches/upstart-0.6/; revision=18251
 2009-11-07 12:01:12 +00:00
Eelco Dolstra
7d47575a58 * A 15-second timeout to start the X server is too low if there are a 
billion other daemons starting at the same time during the boot.

svn path=/nixos/branches/upstart-0.6/; revision=18250
 2009-11-07 11:32:28 +00:00
Eelco Dolstra
06fcb121fb * Shut down PostgreSQL cleanly. 
svn path=/nixos/branches/upstart-0.6/; revision=18236
 2009-11-06 23:37:31 +00:00
Eelco Dolstra
18f2d75275 * Set a timezone in the PostgreSQL job. Otherwise database 
initialisation will be incredibly slow (minutes instead of
  seconds).  An strace shows that it's continuously looking up
  timezone information if TZ is empty.

svn path=/nixos/branches/upstart-0.6/; revision=18235
 2009-11-06 22:56:47 +00:00
Eelco Dolstra
d7342c78d4 * Support pre-stop scripts. These are needed to cleanly shutdown 
daemons such as Apache or PostgreSQL.

svn path=/nixos/branches/upstart-0.6/; revision=18234
 2009-11-06 22:45:19 +00:00
Eelco Dolstra
83a9bf9a6a * Change all the startOn / stopOn attributes to the Upstart 0.6 syntax 
(e.g., startOn = "started foo" instead of startOn = "foo").

svn path=/nixos/branches/upstart-0.6/; revision=18230
 2009-11-06 22:19:17 +00:00
Eelco Dolstra
a60d83d3b4 svn path=/nixos/branches/upstart-0.6/; revision=18228 2009-11-06 21:39:18 +00:00
Eelco Dolstra
d545d08461 * In the network-interfaces task, emit an ip-up event if there is a 
statically configured interface (i.e. we're not running dhclient).
  Otherwise the ntpd job won't be triggered.
* Use the "-n" flag of "initctl emit" to send the event
  asynchronously.

svn path=/nixos/branches/upstart-0.6/; revision=18227
 2009-11-06 21:38:40 +00:00
Eelco Dolstra
c0f732f079 * Work around a lack of laziness in the xserver.nix module. 
svn path=/nixos/trunk/; revision=18216
 2009-11-06 16:30:48 +00:00
Nicolas Pierron
e07f1e98db * Revert 18115, 18150, 18135, 18112, 18107-18105. 
Revert modifications done on apache-httpd configurations.


svn path=/nixos/trunk/; revision=18215
 2009-11-06 16:23:25 +00:00
Eelco Dolstra
b9bfe7ed43 * Connect Upstart to the system bus. 
svn path=/nixos/branches/upstart-0.6/; revision=18213
 2009-11-06 15:59:23 +00:00
Eelco Dolstra
9fa2f12cc2 * Do some more jobs. 
svn path=/nixos/branches/upstart-0.6/; revision=18212
 2009-11-06 15:46:56 +00:00
Eelco Dolstra
903e92bde6 * Use Upstart's "export fork" feature to properly detect when a daemon 
is "ready".  This prevents ugly race conditions, e.g. HAL failing to
  start because dbus hasn't finished starting yet.
* Support post-start scripts.  These are executed after the job's main
  process has started but before the job's "started" event is
  emitted.  For instance, the udev job uses this to perform "udevadm
  trigger / settle" to create all devices.  Previously this had to be
  done in the pre-start script, so the daemon had to started in the
  pre-start script as well.

svn path=/nixos/branches/upstart-0.6/; revision=18211
 2009-11-06 15:23:16 +00:00
Eelco Dolstra
5d240b99d5 * Work around a bug in HAL (it fails to start if $PATH is too long, 
since it uses a 512-byte buffer somewhere).

svn path=/nixos/branches/upstart-0.6/; revision=18198
 2009-11-06 11:31:57 +00:00
Eelco Dolstra
7011a9315f * Use Upstart 0.6. Jobs are now in /etc/init instead of /etc/event.d. 
svn path=/nixos/branches/upstart-0.6/; revision=18192
 2009-11-06 10:43:38 +00:00
Eelco Dolstra
b581a56d79 * Define the Upstart package to use in one place. 
svn path=/nixos/branches/upstart-0.6/; revision=18187
 2009-11-06 09:36:35 +00:00
Eelco Dolstra
124096e418 * Remember the original symbolic driver name. 
svn path=/nixos/trunk/; revision=18185
 2009-11-06 09:22:00 +00:00
Eelco Dolstra
3e9665dd96 * X server autoconfiguration. Rather than specifying a fixed video 
driver (in services.xserver.videoDriver), the X server is now given
  a set of drivers, and will use PCI ids to find the right one.

  The only problem is that the choice of OpenGL driver (the
  /var/run/opengl-driver symlink) depends on what driver is selected
  at runtime (i.e. the NVIDIA implementation for "nvidia", and Mesa
  for all other drivers).  However this isn't a big problem right now
  since "nvidia" isn't included in the default set of drivers anyway
  for legal reasons.
  
* `services.xserver.resolutions' now defaults to [], meaning that the
  X server should figure out the desired resolution(s) itself.
  Likewise, `services.xserver.defaultDepth' defaults to 0 to let the X
  server figure it out.

* Removed some options from xorg.conf that no longer appear needed
  ("Composite" and the DRI "Mode").

svn path=/nixos/trunk/; revision=18176
 2009-11-06 00:59:03 +00:00
Lluís Batlle i Rossell
fe1f084728 Adding a new xorg driver: unichrome 
svn path=/nixos/trunk/; revision=18163
 2009-11-05 21:35:36 +00:00
Nicolas Pierron
72f804c9b2 * Fix subversion test and change the name of the "config" option to 
"configuration" because it may interfered with sub-modules keywords.

svn path=/nixos/trunk/; revision=18155
 2009-11-05 19:24:02 +00:00
Nicolas Pierron
7571055ad3 * Declare options for sub-services. 
* Add deprecated options for "serviceType", "serviceName", "function" and
  "config" without changing the behavior.

svn path=/nixos/trunk/; revision=18150
 2009-11-05 18:21:03 +00:00
Nicolas Pierron
1952365a51 * Remove unused subservice syntax. 
svn path=/nixos/trunk/; revision=18135
 2009-11-05 13:34:01 +00:00