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
Eelco Dolstra
28b7d67d08
httpd: Don't require keys.target
...
This has the unintended side-effect of restarting httpd every time we
run switch-to-configuration, even if httpd hasn't changed (because
we're doing a "stop keys.target" now). So use a "Wants" dependency
instead.
2014-03-17 15:01:10 +01:00
Rickard Nilsson
91e6d7411e
winstone NixOS module: Make it possible to set systemd service name
2014-03-12 23:28:38 +01:00
Rickard Nilsson
f24940330b
New NixOS module: services.winstone, for running instances of the Winstone Java Servlet container
2014-03-12 23:14:09 +01:00
Rickard Nilsson
4e23573138
phpfpm module: Make extraConfig and poolConfigs mergeable by switching option type to types.lines
2014-03-12 11:45:31 +01:00
Rickard Nilsson
562a8ca4a2
Add phpfpm NixOS service module
2014-03-12 11:38:50 +01:00
Domen Kožar
97a0dd9eb9
nixos: set all package options to have type package
2014-02-27 13:22:29 +01:00
Shea Levy
f7c04b1e6b
mediawiki: Don't rewrite /images if uploads are enabled
2014-02-27 07:17:10 -05:00
Shea Levy
1e7300ad67
mediawiki rewrite rules only needed with no urlPrefix
2014-02-27 07:17:10 -05:00
Shea Levy
793328e1ee
Mediawiki: Add some needed rewrites
2014-02-25 09:13:40 -05:00
Shea Levy
0d4a9e3aa6
Allow httpd subservices to set the document root
...
Only the main service OR one of the subservices can set the document
root. This is used by mediawiki when it is hosted at the root of the
vhost.
2014-02-25 07:44:45 -05:00
Domen Kožar
85d38d1436
nginx: add appendConfig option with types.lines
2014-02-12 19:13:36 +01:00
Shea Levy
6a8cc9ab11
mediawiki: Fix some references to /bin/bash
2014-02-10 09:14:30 -05:00
Shea Levy
42df6fcee9
mediawiki: Run update script after initializing the database
2014-02-10 08:56:16 -05:00
Rob Vermaas
9b1bd84940
httpd: Respect original order of environment eval.
2014-01-31 21:18:24 +01:00
Rob Vermaas
bfa56d7657
httpd: Only add PHPRC to environment of httpd when enablePHP is true.
2014-01-31 21:14:05 +01:00
Rob Vermaas
4ccd60af00
Merge pull request #1178 from chexxor/fix-httpd-ssh
...
HTTPD: Check for SSL Cert value before building with SSL support.
2014-01-27 12:34:42 -08:00
Eelco Dolstra
f5844f98ac
mediawiki: Update to 1.20.8
...
CVE-2013-4567, CVE-2013-4568
2013-12-20 14:46:57 +01:00
Eelco Dolstra
886b9e27a6
httpd.nix: Support non-root operation
2013-11-18 18:04:17 +01:00
Eelco Dolstra
e815e4026a
mediawiki: Update to 1.20.7
2013-11-13 17:33:58 +01:00
Eelco Dolstra
785eaf2cea
Add some primops to lib
2013-11-12 13:48:30 +01:00
Alex Berg
da654ed9a0
Check empty stringfor globalRedirect. It breaks RedirectPermanent.
2013-11-11 15:18:46 +08:00
Alex Berg
df5f491893
Add HTTPD SSH assertion to check null cert/key.
2013-11-11 12:08:36 +08:00
Michael Raskin
f8ddc0cbd4
Merge pull request #1099 from offlinehacker/nixos/nginx/package_change_support
...
nixos/nginx: allow to specify which package to use
2013-11-07 02:59:09 -08:00
Alex Berg
0427e7fbf2
Check for SSL Cert value before building with SSL support.
2013-11-06 11:20:14 +08:00
Eelco Dolstra
be5d3a59dd
Clean up some option examples
2013-10-30 18:47:43 +01:00
Eelco Dolstra
862e3dd977
Substitute "types.uniq types.string" -> "types.str"
2013-10-30 14:57:42 +01:00
Eelco Dolstra
985f1f2d8a
Give types to the Apache httpd options
2013-10-29 14:03:39 +01:00
Rok Garbas
38df1d24c4
nixos: zope2 service: adding clientHome option
2013-10-29 12:53:08 +01:00
Eelco Dolstra
98ae32286f
Fix evaluation error in the tomcat test
2013-10-29 01:26:51 +01:00
Eelco Dolstra
738a6c173a
Don't copy Nix expressions to the store while processing Apache subservices
2013-10-29 01:20:33 +01:00
Eelco Dolstra
c9dad37f01
Remove obsolete function addDefaultOptionValues
2013-10-28 22:45:58 +01:00
Eelco Dolstra
f8a9eb9f00
Implement services.httpd.virtualHosts using the module system
2013-10-28 22:45:58 +01:00
Jaka Hudoklin
c7429711b8
nixos/nginx: allow to specify which package to use
...
This enables to override which plugins to include with nginx by allowing to change
nginx package. I also removed webdav option in nginx nixos module, because you
can now specify this by overriding nginx package.
2013-10-20 22:52:02 +02:00