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
Sander van der Burg
5005c49e45
Added forgotten documentRoot variable
...
svn path=/nixos/trunk/; revision=11081
2008-03-12 12:21:12 +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
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
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
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
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
2fc94b76fe
* Eliminate all calls to config.get.
...
svn path=/nixos/trunk/; revision=9619
2007-11-09 18:49:45 +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
f7d2ccdb87
Added mod_php option for httpd.
...
svn path=/nixos/trunk/; revision=9155
2007-08-18 15:19:27 +00:00
Michael Raskin
8843f3c287
Corrected dependencies for gw6c; also made httpd depend on gw6c if needed.
...
svn path=/nixos/trunk/; revision=9029
2007-08-02 21:26:38 +00:00
Michael Raskin
055a950331
Apache httpd customization - extraDirectories & noUserDir .
...
svn path=/nixos/trunk/; revision=8985
2007-07-15 11:16:01 +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
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
Martin Bravenboer
8e6c1ba85d
Support organization configuration for subversion
...
svn path=/nixos/trunk/; revision=8006
2007-02-22 10:55:58 +00:00
Martin Bravenboer
e99ffcbe71
changed the extraSubservices to a list of functions
...
svn path=/nixos/trunk/; revision=7931
2007-02-20 15:57:15 +00:00
Martin Bravenboer
eeee6ea1e2
added configuration option for extraSubservices, which allows you to plugin an arbitrary service into the webserver.
...
svn path=/nixos/trunk/; revision=7926
2007-02-20 15:11:49 +00:00
Eelco Dolstra
ac93023f35
* Pass userCreationDomain.
...
svn path=/nixos/trunk/; revision=7891
2007-02-12 11:57:18 +00:00
Eelco Dolstra
acacfda1b2
* Remove references to stdenvNew.
...
svn path=/nixos/trunk/; revision=7532
2007-01-04 10:21:25 +00:00
Eelco Dolstra
2d6e8e63ae
* Forgot to commit.
...
svn path=/nixos/trunk/; revision=7430
2006-12-19 21:31:19 +00:00
Eelco Dolstra
af1c54fbdc
* Subversion subservice.
...
* Example of a NixOS configuration for a Subversion server.
svn path=/nixos/trunk/; revision=7412
2006-12-19 01:03:15 +00:00
Eelco Dolstra
9f47929138
* Apache configuration.
...
svn path=/nixos/trunk/; revision=7393
2006-12-18 19:46:48 +00:00
Eelco Dolstra
70f929a0a5
* Upstart job for Apache.
...
svn path=/nixos/trunk/; revision=7391
2006-12-18 19:20:03 +00:00