Eelco Dolstra
d0c9a3ce32
Apache: build PHP against the right httpd
...
If httpd is built with a threaded MPM, then PHP needs to be built with
thread support as well.
2012-07-06 23:28:46 +02:00
Eelco Dolstra
18031e41bb
Apache: Add an option to set the MPM
...
Supported values are "prefork" (default), "worker" and "event"
(experimental in Apache 2.2 but not 2.4).
2012-07-06 14:23:55 -04:00
Eelco Dolstra
a07eb262a0
Apache: don't fork into the background due to Upstart weirdness
...
If Apache crashes during startup, Upstart for some reason shows the
job in the "start/running" state. As a workaround, don't fork.
2012-07-06 13:47:42 -04:00
Eelco Dolstra
46dce21bff
MediaWiki: Generalise the skins support
...
The new option ‘skins’ allows specifying a list of directories
providing skins to be added to the MediaWiki installation. The
‘defaultSkin’ option just sets the default.
2012-07-05 21:04:23 +02:00
Eelco Dolstra
ce3941d6e6
* Move logFormat to the per-vhost options.
...
svn path=/nixos/trunk/; revision=34066
2012-05-11 23:14:05 +00:00
Mathijs Kwik
8bfe513e75
renamed "all-interfaces" to "networking"
...
svn path=/nixos/trunk/; revision=32780
2012-03-04 18:44:42 +00:00
Mathijs Kwik
86bf5566fe
many daemons: depend on all-interfaces instead of gw6c
...
svn path=/nixos/trunk/; revision=32766
2012-03-04 12:58:18 +00:00
Sander van der Burg
4249f803ad
Removed some tabs
...
svn path=/nixos/trunk/; revision=32051
2012-02-06 14:04:15 +00:00
Sander van der Burg
82ca072c23
Added extraWorkersProperties parameter, so that custom tweaks can be added
...
svn path=/nixos/trunk/; revision=32050
2012-02-06 13:11:48 +00:00
Sander van der Burg
5363c8b8ae
Remove ugly pkgs.tomcat6 references
...
svn path=/nixos/trunk/; revision=32049
2012-02-06 13:03:56 +00:00
Eelco Dolstra
8eba736da9
* Use the ‘path’ attribute in Upstart jobs in more places. It's a bit
...
more readable (also in "ps" output).
svn path=/nixos/trunk/; revision=30565
2011-11-25 16:32:54 +00:00
Eelco Dolstra
71e6f6ecdc
* Start httpd after postgresql since the mediawiki subservice depends
...
on it.
svn path=/nixos/trunk/; revision=30161
2011-11-01 13:44:48 +00:00
Peter Simons
20b364f4de
Reverting revisions 30103-30106: "always set nixpkgs.config.{state,store}Dir", etc.
...
After the change from revision 30103, nixos-rebuild suddenly consumed
freaky amounts of memory. I had to abort the process after it had
allocated well in excess of 30GB(!) of RAM. I'm not sure what is causing
this behavior, but undoing that assignment fixes the problem. The other
two commits needed to be revoked, too, because they depend on 30103.
svn path=/nixos/trunk/; revision=30127
2011-10-30 15:19:58 +00:00
Shea Levy
09cf6ce70c
find modules | fgrep .nix | fgrep -v .svn | fgrep -v nixpkgs.nix | xargs sed -i -e 's|/nix/var|${config.nixpkgs.config.nix.stateDir}|g' -e 's|/nix/store|${config.nixpkgs.config.nix.storeDir}|g'
...
Don't assume /nix/store or /nix/var in NixOS modules, this is configurable
svn path=/nixos/trunk/; revision=30104
2011-10-29 21:03:57 +00:00
Eelco Dolstra
0f816374c7
* Use shm and posixsem for the SSL session cache.
...
svn path=/nixos/trunk/; revision=29658
2011-10-05 12:24:53 +00:00
Peter Simons
eb6e1310b8
strip trailing whitespace; no functional change
...
svn path=/nixos/trunk/; revision=29285
2011-09-14 18:20:50 +00:00
Eelco Dolstra
d75efe4aa1
* For security, don't mount the entire host filesystem.
...
svn path=/nixos/trunk/; revision=28429
2011-08-09 14:07:44 +00:00
Eelco Dolstra
1d09ad240a
* Don't set defaultSkin to "default" because that's a horrible skin
...
(does it even exist?). Use "" instead (which is really "monobook").
svn path=/nixos/trunk/; revision=27604
2011-07-04 15:51:38 +00:00
Joachim Schiele
1ea24769a0
added support for two custom themes and also wrote a nice looking nixos theme
...
svn path=/nixos/trunk/; revision=27535
2011-06-23 20:56:37 +00:00
Eelco Dolstra
aefa687b02
* Move the twiki module out of the NixOS tree.
...
svn path=/nixos/trunk/; revision=27001
2011-04-27 15:00:32 +00:00
Eelco Dolstra
56f1918e1c
* Move the Subversion/Repoman module out of the NixOS tree.
...
svn path=/nixos/trunk/; revision=27000
2011-04-27 14:52:55 +00:00
Eelco Dolstra
e3a2cd58e0
svn path=/nixos/trunk/; revision=26998
2011-04-27 14:10:33 +00:00
Eelco Dolstra
e5966f96b7
* Fix the jboss module.
...
svn path=/nixos/trunk/; revision=26992
2011-04-27 13:33:06 +00:00
Eelco Dolstra
650d14be8d
* Remove most references to the "services" tree.
...
svn path=/nixos/trunk/; revision=26990
2011-04-27 13:16:33 +00:00
Lluís Batlle i Rossell
82a0aa0a8f
Fixing a path in the trac ldap part. Too much slashes make things go wrong.
...
svn path=/nixos/trunk/; revision=26786
2011-04-11 19:43:48 +00:00
Lluís Batlle i Rossell
9c492e34bb
Making the trac module ldap-aware (for the authentication) and sqlite aware.
...
svn path=/nixos/trunk/; revision=26768
2011-04-09 16:05:36 +00:00
Eelco Dolstra
ec16a59845
* Support file uploads in MediaWiki.
...
svn path=/nixos/trunk/; revision=25145
2010-12-15 13:21:21 +00:00
Eelco Dolstra
0887471e4e
* Mediawiki 1.15.5.
...
svn path=/nixos/trunk/; revision=25144
2010-12-15 12:53:44 +00:00
Sander van der Burg
e39b10a4d9
- The Disnix service needs Nix in its PATH for now
...
- Implemented an extraGroups property for tomcat to grant a tomcat application access to the Disnix service
svn path=/nixos/trunk/; revision=24561
2010-11-01 19:01:26 +00:00
Lluís Batlle i Rossell
c4dd77ae9c
Make apache start when filesystems are ready.
...
svn path=/nixos/trunk/; revision=24544
2010-10-30 20:05:38 +00:00
Eelco Dolstra
f9d4df1e04
svn path=/nixos/trunk/; revision=24185
2010-10-08 12:57:21 +00:00
Rob Vermaas
f2f048db4d
mercurial/apache: put PYTHONPATH in globalEnvVars
...
svn path=/nixos/trunk/; revision=24115
2010-10-06 12:38:37 +00:00
Rob Vermaas
8d60cad42a
mercurial: initial version for hgweb apache module
...
svn path=/nixos/trunk/; revision=24111
2010-10-06 11:21:15 +00:00
Eelco Dolstra
ab8a6d43c4
svn path=/nixos/trunk/; revision=23998
2010-09-30 13:53:30 +00:00
Eelco Dolstra
e3c2a1f49e
* Fix the dump feature.
...
svn path=/nixos/trunk/; revision=22950
2010-08-04 14:05:14 +00:00
Sander van der Burg
9a94e561a5
The DocumentRoot directory is now automatically created if it does not exists. This will prevent the service from working if a user forgets to create the DocumentRoot directory himself and this also makes automated testing easier.
...
svn path=/nixos/trunk/; revision=22929
2010-08-03 13:48:08 +00:00
Eelco Dolstra
f0b647c326
* Allow the Apache submodules to declare whether they need PHP.
...
Don't depend on PHP unless this is the case.
svn path=/nixos/trunk/; revision=22600
2010-07-14 12:58:38 +00:00
Eelco Dolstra
fb97b5b122
* MediaWiki 1.15.4.
...
svn path=/nixos/trunk/; revision=22589
2010-07-13 21:11:35 +00:00
Eelco Dolstra
5c0f6619cf
* Idem.
...
svn path=/nixos/trunk/; revision=22535
2010-07-08 15:54:10 +00:00
Lluís Batlle i Rossell
41bf426a66
Making the httpd prefork basic settings configurable.
...
I kept the defaults as they where, to avoid surprises.
(150 httpd processes simultaneously answering? Too much for my machines)
svn path=/nixos/trunk/; revision=21220
2010-04-21 20:55:57 +00:00
Yury G. Kudryashov
1e83fe6122
Remove tabs
...
svn path=/nixos/trunk/; revision=21104
2010-04-15 15:47:26 +00:00
Rob Vermaas
b42c2ecc13
* tomcat module: access logging per virtual host and pass right timezone
...
svn path=/nixos/trunk/; revision=21065
2010-04-14 09:31:23 +00:00
Rob Vermaas
f1438d3d27
tomcat: add option to enable accesslog per virtual host (default: off)
...
svn path=/nixos/trunk/; revision=20075
2010-02-17 12:32:19 +00:00
Eelco Dolstra
83b76bc2cf
* Option `services.apache.phpIni' (which is of type derivation)
...
replaced by `services.apache.phpOptions' (of type string).
* Allow Apache subservices to add to phpOptions.
* Set the TZ environment variable in Apache.
* Updated the Zabbix web interface.
svn path=/nixos/trunk/; revision=20023
2010-02-15 19:02:42 +00:00
Eelco Dolstra
07cc5ac2fd
* "python2.5" -> ${pkgs.python.libPrefix}
...
svn path=/nixos/trunk/; revision=19901
2010-02-10 12:39:47 +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
9682f0ed90
svn path=/nixos/trunk/; revision=18872
2009-12-10 09:22:45 +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