Commit Graph

145 Commits

Author SHA1 Message Date
Luca Bruno
920b1d3591 Merge branch 'master' into closure-size 2015-11-29 16:50:26 +01:00
Bas van Dijk
af500630e8 wordpress: use the correct mysql pidDir 2015-11-29 15:46:43 +01:00
Luca Bruno
a412927924 Merge remote-tracking branch 'origin/master' into closure-size 2015-11-25 21:37:30 +01:00
Vladimír Čunát
333d69a5f0 Merge staging into closure-size
The most complex problems were from dealing with switches reverted in
the meantime (gcc5, gmp6, ncurses6).
It's likely that darwin is (still) broken nontrivially.
2015-11-20 14:32:58 +01:00
Domen Kožar
b76519069d Merge pull request from basvandijk/wordpress-fix-extraConfig
wordpress: execute the extraConfig before loading wp-settings.php
2015-11-16 13:16:10 +01:00
Guillaume Maudoux
60ba5ad479 lighttpd: fix mod_rewrite appearing twice 2015-11-14 15:52:25 +01:00
Tuomas Tynkkynen
58dfef2792 treewide: Fix references to apacheHttpd_2_* 2015-10-28 10:23:03 +01:00
Vladimír Čunát
c5579c9184 subversion: fixup some referrers after splitting 2015-10-28 10:22:59 +01:00
Eelco Dolstra
89e983786a Manual: Remove store path references 2015-09-24 11:50:58 +02:00
Bas van Dijk
5cf5e7ff4c wordpress: allow extending Wordpress's .htaccess file 2015-09-10 13:21:38 +02:00
Bas van Dijk
a9332583eb wordpress: Execute the extraConfig before loading wp-settings.php
This is needed so that settings defined in extraConfig actually get handled.
2015-09-09 01:12:10 +02:00
Bas van Dijk
88d9fd93c6 wordpress: 4.2.2 -> 4.3 2015-09-08 10:36:44 +02:00
Domen Kožar
ba5919ef3b nginx: include mimetypes mapping
(cherry picked from commit b01eebf021388d92a8aaba9339dcc1fa2270294d)
Signed-off-by: Domen Kožar <domen@dev.si>
2015-09-07 14:43:19 +02:00
Domen Kožar
71e67797d6 Revert "reverse_proxy module: helper to run nginx as reverse proxy"
This reverts commit e6f0cd336d.

These modifications are too specific to use cases and shouldn't be part of
nginx module.
2015-09-07 14:18:31 +02:00
ts468
12d3de1caa Merge pull request from ts468/upstream.nginx
reverse_proxy module: helper to run nginx as reverse proxy
2015-08-30 18:32:07 +02:00
Eelco Dolstra
9d82f7e53e Revert "Apache service module: allow compression"
This reverts commit 164f6ff2a8 per
https://github.com/NixOS/nixpkgs/pull/9407#issuecomment-134523359
(it's too site-specific). Furthermore this should be an option at the
virtual host level.
2015-08-28 12:41:06 +02:00
Thomas Strobel
e6f0cd336d reverse_proxy module: helper to run nginx as reverse proxy 2015-08-28 09:33:08 +02:00
Wout Mertens
164f6ff2a8 Apache service module: allow compression 2015-08-23 15:13:52 +02:00
Luca Bruno
883517f37c phpfpm: use latest php 2015-07-17 18:09:50 +02:00
Eelco Dolstra
9fa19cfcea apache-httpd: Don't set default content encodings
In general, you don't want a .tar.gz file to be served with
"Content-Encoding: x-gzip", because this causes browsers (like Chrome
or "curl --compressed") to decompress the file on the fly. So you end
up with a .tar rather than .tar.gz file, which is unexpected.

If people want such encodings, they should set them in their own NixOS
configuration.
2015-07-07 12:12:49 +02:00
Leroy Hopson
1eb50ebbf2 shellinabox service: intial implementation 2015-07-04 21:18:13 +12:00
Joachim Schiele
11cd596aea wordpress: language downloads are now reproducible 2015-07-03 13:06:44 +02:00
Joachim Schiele
011993c86a wordpress: usability updates 2015-06-25 16:21:14 +02:00
Russell O'Connor
46f06ccde7 uwsgi-service: Add user/group for uwsgi service.
Also add a uwsgi directory under /run (defaulting to /run/uwsgi) where the uwsgi user can place sockets.
2015-06-24 14:48:53 +00:00
Eelco Dolstra
19ffa212af types.uniq types.int -> types.int
types.int already implies uniqueness.
2015-06-15 18:11:32 +02:00
Eelco Dolstra
c738b309ee types.uniq types.bool -> types.bool 2015-06-15 18:10:26 +02:00
Arseniy Seroka
8150cf11b0 Merge pull request from ip1981/wiki
Mediawiki updates
2015-04-28 19:00:27 +03:00
Jaka Hudoklin
7b878a7ca9 Merge pull request from offlinehacker/nixos/nginx/reload
nixos/nginx: enable service/config reload
2015-04-28 14:12:21 +02:00
Igor Pashev
4855b0b3fb Mediawiki 1.23.9 2015-04-28 08:05:16 +00:00
Igor Pashev
bca76e46f0 Apache servedFiles: fixed a typo in example 2015-04-28 08:05:15 +00:00
Igor Pashev
8388bd3280 wiki: do not rewrite served files 2015-04-28 08:05:08 +00:00
Eelco Dolstra
534b84a9ac Don't require sslServerChain to be set 2015-04-27 18:24:16 +02:00
Jaka Hudoklin
494d1820e3 nixos/nginx: enable service/config reload 2015-04-25 15:17:06 +02:00
Eelco Dolstra
574173f0e6 Merge pull request from ecraven/apache-sslchain
apache-httpd: adding support for sslServerChain
2015-04-13 16:48:20 +02:00
Peter Feigl
3837ef82ad fixing documentation 2015-04-13 15:42:01 +02:00
Peter Feigl
e5b3918f85 apache-httpd: adding support for sslServerChain 2015-04-13 15:41:10 +02:00
Peter Feigl
69b18fc4b6 fixing indentation 2015-04-13 13:46:42 +02:00
Peter Feigl
44ea83b986 changed config to only include the minimum necessary 2015-04-13 13:10:04 +02:00
Peter Feigl
49eb77b26c apache-httpd: adding subservice moodle 2015-04-13 13:06:39 +02:00
Joachim Schiele
85c454ab1d Merge pull request from qknight/wordpress
zef hemel's wordpress.nix adapted to extraSubservices
2015-04-13 10:27:55 +02:00
Luca Bruno
cb45b7ec3e Revert "nixos: Multiple service instances, apply to nginx. See "
This reverts commit 7ef59c4fe2.

Wrong push! Sorry!
2015-03-18 14:09:24 +00:00
Luca Bruno
7ef59c4fe2 nixos: Multiple service instances, apply to nginx. See 2015-03-18 14:07:29 +00:00
Philip Potter
7ad6dac43b owncloud: don't store plaintext adminPassword in nix store
Rather than using openssl to hash the password at build time, and hence
leaving the plaintext password world-readable in the nix store, we can
instead hash the password in the nix expression itself using
builtins.hashString.
2015-03-16 22:42:22 +00:00
Joachim Schiele
d74ea7d34f zef hemels' wordpress.nix adapted to extraSubservices 2015-03-13 14:19:48 +01:00
lethalman
f72d1abb79 Merge pull request from arno01/nginx
nginx service improvements
2015-03-13 11:41:27 +01:00
lethalman
70527b87a1 Merge pull request from k0ral/fcgiwrap
Updated fcgiwrap's systemd unit to match upstream version.
2015-03-10 13:18:46 +01:00
Eelco Dolstra
8cb3e3b864 httpd: Disable insecure protocols/ciphers by default
This makes us resistant to FREAK and similar attacks.
2015-03-09 14:18:12 +01:00
koral
d9078d03a3 Updated fcgiwrap's systemd unit to match upstream version. 2015-02-18 21:19:12 +00:00
Jaka Hudoklin
41ae4d1af9 add limesurvey package and nixos module 2015-02-07 23:18:51 +01:00
Nikolay Amiantov
51681449da uwsgi: add nixos module 2015-02-02 22:23:42 +03:00