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
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
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
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
Eelco Dolstra
10cc22203e
* No longer needed.
...
svn path=/nixos/trunk/; revision=11538
2008-04-10 09:14:55 +00:00
Eelco Dolstra
8b98c3b125
svn path=/nixos/trunk/; revision=10947
2008-03-04 13:37:52 +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
Eelco Dolstra
50800ad3b5
svn path=/nixos/trunk/; revision=10781
2008-02-20 13:29:08 +00:00
Eelco Dolstra
705c2d36db
svn path=/nixos/trunk/; revision=10777
2008-02-20 12:54:17 +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
5d2435d460
* Top-level redirect to the repoman.
...
svn path=/nixos/trunk/; revision=10758
2008-02-19 16:52:24 +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
a9281eae63
* Put the static files for the Subversion service in a separate directory.
...
svn path=/nixos/trunk/; revision=10697
2008-02-14 20:59:04 +00:00
Eelco Dolstra
7563d6e144
svn path=/nixos/trunk/; revision=10693
2008-02-14 20:14:57 +00:00
Eelco Dolstra
a06b51f895
svn path=/nixos/trunk/; revision=10692
2008-02-14 19:47:17 +00:00
Eelco Dolstra
ffd96f07fe
svn path=/nixos/trunk/; revision=10689
2008-02-14 14:29:21 +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