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
Eelco Dolstra
50800ad3b5
svn path=/nixos/trunk/; revision=10781
2008-02-20 13:29:08 +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
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
Eelco Dolstra
bbbef0f2fa
* extraDirectores -> extraConfig.
...
svn path=/nixos/trunk/; revision=10731
2008-02-18 15:00:26 +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
Eelco Dolstra
8bf1cade68
* New-style Subversion server configuration.
...
svn path=/nixos/trunk/; revision=10508
2008-02-05 16:25:07 +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
Michael Raskin
b3fa4f1e4e
Added some xfs and general font changes.
...
svn path=/nixos/trunk/; revision=9966
2007-12-25 12:16:38 +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