Rickard Nilsson
2b3c3d0e32
Fixes to Apache 2.4 configuration
2014-11-06 21:58:40 +01:00
Eelco Dolstra
b3eb981a95
apache-httpd: Make 2.4 the default
...
The NixOS 14.11 release is a good time to finally make 2.4 the
default.
2014-11-06 14:55:44 +01:00
Bjørn Forsman
fca51849ec
nixos/lighttpd: add services.lighttpd.enableModules option
...
This option makes the coupling between lighttpd and its sub-services
more "loose".
While the option is a list, its purpose is to provide a "set" of needed
modules to load for lighttpd to function correctly with its config. The
NixOS lighttpd module ensures that lighttpd modules are loaded no more
than once (because lighttpd dislikes that), and in the correct order.
Also add an assertion that all modules listed in .enableModules are
valid.
2014-10-05 19:15:19 +02:00
Eelco Dolstra
0de982d75b
httpd: Add option for specifying robots.txt
2014-09-18 19:05:26 +02:00
Eelco Dolstra
837a0c05e5
httpd: Don't emit robots.txt if there are no robots entries
2014-09-18 18:48:28 +02:00
Bjørn Forsman
a44de69d06
nixos/tomcat: make package version configurable
2014-09-11 22:32:16 +02:00
Igor Pashev
5c6e4e7433
Updated Mediawiki to 1.23.3
...
Removed mediawiki-postgresql-fixes.patch (fixed upstream)
2014-09-07 17:50:51 +02:00
Strahinja Popovic
fe3f7716f0
Enabled access to binaries of needed tools, and worker daemons can be enabled for phabricator #3306
2014-09-03 15:46:59 +04:00
Michael Raskin
3ad91106f1
Merge pull request #3704 from sfultong/upstream-master
...
tomcat: update to upstream master
2014-09-02 02:09:18 +04:00
Igor Pashev
019bc6bb2b
Made Mediawiki rewrite rules work for virtual hosts
...
Related to cdd1785cd6
2014-08-29 13:56:23 +02:00
aszlig
8a56a55bb4
nixos/manual: Use literalExample when feasible.
...
Should bring most of the examples into a better consistency regarding
syntactic representation in the manual.
Thanks to @devhell for reporting.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-08-27 23:41:15 +02:00
Igor Pashev
cdd1785cd6
Fixed rewrite rules for Mediawiki
...
If Mediawiki was served from the root directory of the server
it was impossible to serve other directories.
Make sure that URLs defined in servedDirs are not rewritten.
Use case: serving local copy of MathJax
2014-08-25 11:55:57 +02:00
Michael Raskin
c0da615c02
Merge pull request #3230 from robberer/module/httpd
...
httpd: disable logging when logFormat = "none"
2014-08-23 11:37:48 +04:00
sfultong
c54a8ed1d0
Merge pull request #1 from sfultongv/sfultong-14.04
...
updating tomcat to version 7
2014-08-20 23:08:39 -04:00
Harald van Dijk
67a5ec4efb
nixos/lighttpd: fix modules for gitweb
...
Setting "services.lighttpd.gitweb.enable" to true doesn't enable the
required lighttpd modules to actually make it work. The problem is that
"or" and "||" don't mean the same thing: "or" falls back to the second
operand if the first is not defined, whereas "||" is the normal logical
operator. When cfg.cgit.enable is defined, as false, the expressions
don't have the desired effect.
[Bjørn: modify commit message]
2014-08-12 21:16:01 +02:00
Peter Simons
2d326e5032
Merge remote-tracking branch 'origin/master' into staging.
...
Conflicts:
pkgs/desktops/e18/enlightenment.nix
2014-08-04 16:51:47 +02:00
Chris Farmiloe
34890e7c2a
nixos: Add enablePHP convinence option to services.httpd module to mimic subservices option
...
Fixes #2699
2014-08-03 21:11:45 +02:00
aszlig
9d3fbcd054
tomcat: Fix evaluation after e27dcff
.
...
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-08-03 16:09:45 +02:00
Sander van der Burg
2e44bb9ead
Merge pull request #3425 from luke-clifton/lc-tomcat-jdk
...
Allows the JDK to be chosen in services.tomcat
2014-08-03 14:55:46 +02:00
Shea Levy
7fec575976
Fix lib functions taken from pkgs.lib instead of lib in nixos
2014-08-01 16:23:56 -04:00
Luke Clifton
e27dcfff1b
Allows the JDK to be chosen in services.tomcat
2014-08-01 16:52:19 +08:00
Danny Groenewegen
51494f2c33
Restore extraWorkersProperties option for apache httpd tomcat-connector, issue https://github.com/NixOS/nixpkgs/issues/2202
2014-07-31 16:51:51 +02:00
Eelco Dolstra
f64d84698e
Merge remote-tracking branch 'origin/master' into staging
...
Conflicts:
pkgs/applications/audio/espeak/edit.nix
pkgs/applications/audio/lmms/default.nix
pkgs/desktops/e18/enlightenment.nix
pkgs/games/exult/default.nix
pkgs/os-specific/linux/alsa-plugins/default.nix
2014-07-28 11:30:49 +02:00
Bjørn Forsman
162cb556f6
nixos/lighttpd: improve sub-service option types (cgit, gitweb)
2014-07-23 22:18:37 +02:00
Bjørn Forsman
35ebc72f1c
nixos/lighttpd-service: don't use types.string (it's deprecated)
2014-07-23 22:12:38 +02:00
Eelco Dolstra
ff97b7dbe6
Merge remote-tracking branch 'origin/master' into staging
2014-07-14 17:04:55 +02:00
System administrator
cab929c6c2
httpd: disable logging when logFormat = "none"
2014-07-10 14:32:08 +02:00
Sönke Hahn
09448101c3
mediawiki: add patch for fixing postgresql errors
2014-07-07 23:19:31 +08:00
Eelco Dolstra
95b828de42
Merge remote-tracking branch 'origin/master' into staging
2014-07-07 13:16:26 +02:00
Igor Pashev
d4a320cd12
Updated Mediawiki to 1.23.1
2014-07-04 17:34:37 +02:00
Shea Levy
b3cfb9084b
Get all lib functions from lib, not pkgs.lib, in modules
2014-07-02 12:28:18 -04:00
Eelco Dolstra
06fc1ec34d
Merge remote-tracking branch 'origin/master' into staging
...
Conflicts:
pkgs/servers/serfdom/default.nix
2014-07-01 11:25:41 +02:00
Eelco Dolstra
40f7b0f9df
Another attempt to eradicate ensureDir
...
See c556a6ea46
.
2014-06-30 14:56:10 +02:00
Michael Raskin
02266194ea
Merge pull request #2894 from kirelagin/fixusergroup
...
Fix conditional handling of users and groups in some services
2014-06-30 10:16:20 +04:00
Austin Seipp
91f1dda340
Merge pull request #2980 from bluescreen303/php-fpm
...
phpfpm: add option for setting php.ini file
2014-06-18 16:08:21 -05:00
Mathijs Kwik
35df71ac1d
phpfpm: add option for setting php.ini file
2014-06-16 22:44:18 +02:00
Mathijs Kwik
a97bef3e8c
nixos/nginx: fix group and stateDir permissions
...
furthermore, I don't think adding nginx to systemPackages is of any use.
2014-06-16 22:43:58 +02:00
Kirill Elagin
f81434bdfe
Fix trying to add users to non-existent groups
2014-06-11 13:36:15 +04:00
Kirill Elagin
1208dd4df0
Fix configuring apache with extra user/group
...
This fix is consistent with all the other modules.
2014-06-11 13:17:42 +04:00
Kirill Elagin
80721cdd41
Revert "Fix configuring httpd with custom user/group."
...
This reverts commit 08f9da2e8e
.
2014-06-11 13:17:00 +04:00
Rob Vermaas
08f9da2e8e
Fix configuring httpd with custom user/group.
2014-06-11 10:18:37 +02:00
Luca Bruno
94c2661503
tomcat: fix service to be a daemon, and run tomcat in script rather than preStart
2014-06-06 14:04:35 +02:00
Luca Bruno
12f06b3cc3
fcgiwrap: new package
...
Simple server for running CGI applications over FastCGI
https://nginx.localdomain.pl/wiki/FcgiWrap
2014-06-04 10:20:19 +02:00
Strahinja Popovic
25e0d51a67
Phabricator, a web application, snapshot of 2014-05-12
2014-05-12 19:59:40 +02:00
Eelco Dolstra
2dfbe55421
Remove use of obsolete flags
2014-04-29 10:13:21 +02:00
Eelco Dolstra
4fb50f071f
Manual: Typo fixes
2014-04-19 22:59:25 +02:00
Eelco Dolstra
29027fd1e1
Rewrite ‘with pkgs.lib’ -> ‘with lib’
...
Using pkgs.lib on the spine of module evaluation is problematic
because the pkgs argument depends on the result of module
evaluation. To prevent an infinite recursion, pkgs and some of the
modules are evaluated twice, which is inefficient. Using ‘with lib’
prevents this problem.
2014-04-14 16:26:48 +02:00
Eelco Dolstra
d2155649af
Merge branch 'containers'
...
Fixes #2105 .
2014-04-10 15:55:51 +02:00
aszlig
5dd14a1059
nixos/phpfpm: Add option to set PHP package.
...
This allows to easily override the used PHP package, especially for
example if you want to use PHP 5.5 or if you want to override the
derivation.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-04-10 07:52:26 +02:00
Shea Levy
a1a167bc8b
nginx module: Enable modularly specifying servers
2014-03-17 23:31:56 -04:00