Frederik Rietdijk
7077a270bf
Merge remote-tracking branch 'upstream/master' into HEAD
2016-10-26 13:06:43 +02:00
Emery Hemingway
b675619391
nixos: use types.lines for extraConfig
2016-10-23 19:41:43 +02:00
Frederik Rietdijk
e56832d730
Merge remote-tracking branch 'upstream/master' into HEAD
2016-10-22 17:23:24 +02:00
Robin Gloster
d05d063572
nginx: set correct acme permissions
2016-10-20 11:18:25 +02:00
Frederik Rietdijk
104c50dd1a
Python: remove modules and pythonFull
2016-10-10 10:33:24 +02:00
Franz Pletz
a3ec0f1593
nixos/nginx: reload on acme cert renewal
2016-10-09 12:55:24 +02:00
Peter Hoeg
47a8f1ea85
php-fpm: add reload support
...
Upstream recommends sending USR2 for a graceful reload.
2016-10-06 10:22:24 +08:00
Peter Hoeg
5a6626f47c
php fpm: add systemd support
...
PHP FPM will now notify systemd when it's done initializing and ready to
serve requests.
Additionally ```systemctl status phpfpm``` will now show statistics such
as:
```
Status: "Processes active: 0, idle: 8, Requests: 0, slow: 0, Traffic: 0req/sec"
```
2016-10-05 23:30:31 +08:00
Joachim F
0906a0f197
Merge pull request #18491 from groxxda/network-interfaces
...
Replace Network-interfaces.target
2016-10-02 16:34:37 +02:00
Joachim F
7e80c42b0e
Merge pull request #18511 from ericsagnes/feat/remove-optionSet
...
modules: optionSet -> submodule
2016-10-01 17:57:45 +02:00
Joachim F
4d3282a8fe
Merge pull request #18993 from ericsagnes/mod/php-fpm
...
php-fpm module: cleanup
2016-09-29 13:14:32 +02:00
Graham Christensen
e2688e072d
moodle: mark as broken
...
https://github.com/NixOS/nixpkgs/issues/18856
2016-09-28 08:52:18 -04:00
Graham Christensen
8504237863
mediawiki: 1.23.13 -> 1.27.1
2016-09-26 21:53:36 -04:00
Eric Sagnes
b14ecbb96f
php-fpm module: cleanup
...
- Added example for the pool option
- Unified PHP-FPM spelling
2016-09-27 10:20:22 +09:00
Graham Christensen
4671806183
wordpress: 4.3.1 -> 4.6.1 + add a test
2016-09-26 19:36:07 -04:00
Wilhelm Schuster
54c5154b90
nginx module: Add option to configure events block
2016-09-26 12:16:53 +02:00
Alexander Ried
3ada966bd5
treewide: minor format / style / documentation fixes
2016-09-13 11:19:22 +02:00
Joachim Fasting
3dc69799b6
tomcat: remove use of network-interfaces.target
2016-09-13 11:19:22 +02:00
Eric Sagnes
03ee88f666
zope2 module: optionSet -> submodule
2016-09-13 12:53:12 +09:00
Eric Sagnes
c16d03ddc5
winstone module: optionSet -> submodule
2016-09-13 12:53:12 +09:00
danbst
63f9ef9f19
tomcat service: bump default tomcat to 8.5
...
See migration changelogs at
- 7.0 -> 8.0: https://tomcat.apache.org/migration-8.html
- 8.0 -> 8.5: https://tomcat.apache.org/migration-85.html
2016-09-09 18:29:12 +02:00
danbst
a01d4ee3f4
tomcat: add danbst as maintainer
2016-09-09 18:29:12 +02:00
danbst
f1072611a4
tomcat service: call shutdown in preStop, because postStop is too late (systemd kills process)
2016-09-09 18:29:12 +02:00
danbst
0c2d943529
tomcat: split default webapps to separate output (~6M)
2016-09-09 18:29:12 +02:00
Alexander Ried
e84b803300
security.acme: remove loop when no fallbackHost is given
2016-09-06 17:47:00 +02:00
Robin Gloster
c011aa86ab
nginx module: add index and tryFiles
2016-08-25 23:27:56 +00:00
Robin Lambertz
dacc3fa985
phpfpm: allow old config format as well ( #17754 )
2016-08-15 14:41:26 +02:00
Robin Gloster
3cf5d5ebed
nginx module: fixup events in config
2016-08-09 17:11:28 +00:00
Robin Gloster
b0b0a45bb1
nginx module: fix cfg.config backwards compatibility
...
fixes #17604
2016-08-09 12:02:21 +00:00
Al Zohali
2aba1c4962
phpfpm service: restructured pool configuration
...
From @fpletz: Keep poolConfigs option for backwards-compatibility.
The original commit 6b3f5b5a42
was previously
reverted by c7860cae1a
but the issues were
resolved.
2016-08-08 05:53:53 +02:00
Christian Kauhaus
ea7e705cd9
varnish: fix localstatedir for varnish* tools ( #17508 )
...
The varnish tools (varnishstat, varnishlog, ...) tried to load the VSM
file from a spurious var directory in the Nix store. Fix the default so
the tools "just work" when also keeping services.varnish.stateDir at the
default.
Notes:
- The tools use $localstatedir/$HOSTNAME so I've adapted the default for
stateDir as well to contain hostName.
- Added postStop action to remove the localstatedir. There is no point
in keeping it around when varnish does not run, as it regenerates it
on startup anyway.
Fixes #7495
2016-08-04 15:25:23 +02:00
Franz Pletz
c90a43f4c5
nginx module: fix evaluation of root location option
2016-08-01 19:38:10 +02:00
Robin Gloster
a193fecf0e
nginx module: improve statusPage generated code
...
Adds ::1 as allowed host and turns of access_log for the status page.
2016-07-28 11:59:13 +00:00
Robin Gloster
3ccfca7d6b
nginx module: httpConfig backward compatibility
...
Revert httpConfig its old behaviour and make it mutually exclusive to
the new structured configuration. Adds appendHttpConfig to have the
ability to write custom config in the generated http block.
2016-07-28 11:59:13 +00:00
Robin Gloster
511410789b
nginx module: make client_max_body_size configurable
2016-07-28 11:59:13 +00:00
Tristan Helmich
8c61b3af03
nginx: fixed duplicate http declaration
2016-07-28 11:59:13 +00:00
Robin Gloster
91680de317
nginx module: add statusPage option
2016-07-28 11:59:13 +00:00
Robin Gloster
a294ad01b3
nginx module: make recommended settings optional
2016-07-28 11:59:13 +00:00
Robin Gloster
186a8400ed
nginx module: make httpConfig backward compatible
2016-07-28 11:59:13 +00:00
Robin Gloster
5dd7cf964a
nginx module: improve documentation
2016-07-28 11:59:13 +00:00
Franz Pletz
de8008a1b1
nginx module: Enable http2
2016-07-28 11:59:13 +00:00
Franz Pletz
e982aeae6a
nginx module: Add default proxy headers for tomcat
2016-07-28 11:59:13 +00:00
Robin Gloster
3830a890ab
nginx module: add option to make vhost default
2016-07-28 11:59:13 +00:00
Robin Gloster
138945500e
nginx module: implement basic auth
2016-07-28 11:59:13 +00:00
Robin Gloster
ff12ee35b7
nginx module: redirect to same protocol
2016-07-28 11:59:13 +00:00
Robin Gloster
e18f8e8b66
nginx module: turn off basic auth on acme locations
2016-07-28 11:59:13 +00:00
Franz Pletz
4e5c7913e9
nginx module: Add acmeFallbackHost vhost option
2016-07-28 11:59:13 +00:00
Franz Pletz
811f243ce6
nginx module: Add extraConfig for locations
2016-07-28 11:59:13 +00:00
Franz Pletz
d5a097fdb6
nginx module: Don't create acme certs if acme is not enabled
2016-07-28 11:59:13 +00:00
Tristan Helmich
c61157b7e6
nginx module: Add dhParams option
2016-07-28 11:59:13 +00:00
Tristan Helmich
35d76a72ab
nginx module: Add sslCiphers option
2016-07-28 11:59:13 +00:00
Tristan Helmich
8bd1f401bb
nginx module: Add sslProtocols option
2016-07-28 11:59:13 +00:00
Tristan Helmich
900b311a38
nginx module: Fix ACME extraDomains, fix challenge url to not redirect to allow renewals
2016-07-28 11:59:13 +00:00
Tristan Helmich
4676983990
nginx module: Add ACME support for ssl sites
2016-07-28 11:59:13 +00:00
Robin Gloster
f298be9ef4
nginx module: declarative config
2016-07-28 11:58:37 +00:00
Robin Gloster
356c2fe00d
Revert "nginx: Verify that configuration is syntactically correct" ( #17337 )
2016-07-28 13:55:06 +02:00
Bjørn Forsman
c7860cae1a
Revert "phpfpm service: restructured pool configuration"
...
This reverts commit 6b3f5b5a42
because it
introduced a non-backwards compatible change in the phpfpm interface,
without really needing to. The new interface, if needed, can be re-added
alongside the old interface.
Commit 98e419c0e2
("tt-rss service: init at 16.3")
depends on the new interface, so this commit updates the tt-rss service
to work with the old services.phpfpm.poolConfigs interface.
2016-07-27 23:53:58 +02:00
Robin Lambertz
103805dec5
nginx: Verify that configuration is syntactically correct ( #17208 )
2016-07-27 22:24:08 +02:00
Bjørn Forsman
0a2174f195
nixos/lighttpd: move cgit setup to cgit.nix
...
To where it really belongs. Separation of concern.
2016-07-26 15:37:24 +02:00
Rok Garbas
d73c115aa4
Merge pull request #16132 from zohl/tt-rss
...
tt-rss service: init at 16.3
2016-07-21 20:48:18 +02:00
davidak
83bdc8e858
caddy service: add options to change ACME certificate authority ( #16969 )
...
and agree to let's encrypt subscriber agreement
2016-07-21 01:51:09 +02:00
davidak
d2164cfcda
caddy service: fix nix store output path
...
systemd[11376]: caddy.service: Failed at step EXEC spawning /nix/store/ghpcwj6paccc92l1gk7ykb6gf2i2w6fi-go1.6-caddy-0.8.3/bin/caddy: No such file or directory
2016-07-14 22:04:55 +02:00
Eric Sagnes
ff074ec7a4
apache-httpd: add phpPackage option
2016-06-22 21:24:25 +09:00
Frederik Rietdijk
9e2866d5de
Merge pull request #16086 from layus/inginious
...
INGInious: provide a NixOS module
2016-06-21 16:37:29 +02:00
Al Zohali
6b3f5b5a42
phpfpm service: restructured pool configuration
2016-06-20 01:00:03 +03:00
Guillaume Maudoux
0fef9ed3ed
inginious: init NixOS module
2016-06-14 11:09:21 +02:00
zimbatm
a95229a963
Merge pull request #15677 from womfoo/mod_auth_mellon
...
mod_auth_mellon: init at 0.12.0 and dependency lasso: init at 2.5.1
2016-06-12 23:38:57 +01:00
Kranium Gikos Mendoza
25fbac5b52
mod_auth_mellon: init at 0.12.0
2016-05-23 02:02:25 +08:00
Vladimír Čunát
73f1f5eb39
imagemagick: split dev output to fix #9604
...
Also fixup references to imagemagick.
2016-05-22 13:41:15 +02:00
Vladimír Čunát
65a9fa8cdc
Merge branch 'master' into staging
2016-05-08 21:24:48 +02:00
Eric Sagnes
a8bc5b67f8
php: add default php.ini
2016-04-29 15:26:20 +09:00
Nikolay Amiantov
ab0a0c004e
makeSearchPathOutputs: refactor to makeSearchPathOutput
2016-04-25 13:24:39 +03:00
Nikolay Amiantov
8b7ebaffeb
replace makeSearchPath tree-wise to take care of possible multiple outputs
2016-04-13 22:09:41 +03:00
Vladimír Čunát
39ebb01d6e
Merge branch 'staging', containing closure-size #7701
2016-04-13 09:25:28 +02:00
joachifm
245f200dd8
Merge pull request #11987 from angus-g/caddy
...
Add Caddy and its NixOS module
2016-04-11 09:20:21 +02:00
Vladimír Čunát
30f14243c3
Merge branch 'master' into closure-size
...
Comparison to master evaluations on Hydra:
- 1255515 for nixos
- 1255502 for nixpkgs
2016-04-10 11:17:52 +02:00
Eelco Dolstra
133e6e1ea6
httpd.service: Support reload
...
This is useful when ACME has generated a new TLS certificate.
2016-04-07 17:53:46 +02:00
Lluís Batlle i Rossell
e1bcc27f1a
Making trac/ldap handle httpd 2.4.
...
The option authzldapauthoritative had been removed in 2.4
I pushed this into 16.03 instead of master first. My fault.
(cherry picked from commit 516f47efef
)
2016-04-07 11:40:22 +02:00
Angus Gibson
bb6408ba16
caddy service: initial implementation
2016-04-05 23:45:54 +00:00
Vladimír Čunát
ab15a62c68
Merge branch 'master' into closure-size
...
Beware that stdenv doesn't build. It seems something more will be needed
than just resolution of merge conflicts.
2016-04-01 10:06:01 +02:00
Nikolay Amiantov
25754a5fc2
uwsgi service: use python.buildEnv, fix PATH
2016-03-27 19:23:01 +03:00
Vladimír Čunát
c801cd1a04
php: fixup build when configured with httpd via nixos
2016-03-11 11:54:53 +01:00
Vladimír Čunát
1952d5d5f7
nixos/foswiki: basic working service definition
...
Activation is as simple as:
services.httpd = {
enable = true;
adminAddr = "nobody@example.com";
extraSubservices = [ {
serviceType = "foswiki";
} ];
};
2016-03-08 16:38:43 +01:00
Vladimír Čunát
09af15654f
Merge master into closure-size
...
The kde-5 stuff still didn't merge well.
I hand-fixed what I saw, but there may be more problems.
2016-03-08 09:58:19 +01:00
Eelco Dolstra
f3d94cfc23
Revert "Add the tool "nixos-typecheck" that can check an option declaration to:"
...
This reverts commit cad8957eab
. It
breaks NixOps, but more importantly, such major changes to the module
system really need to be reviewed.
2016-03-01 20:52:06 +01:00
Thomas Strobel
cad8957eab
Add the tool "nixos-typecheck" that can check an option declaration to:
...
- Enforce that an option declaration has a "defaultText" if and only if the
type of the option derives from "package", "packageSet" or "nixpkgsConfig"
and if a "default" attribute is defined.
- Enforce that the value of the "example" attribute is wrapped with "literalExample"
if the type of the option derives from "package", "packageSet" or "nixpkgsConfig".
- Warn if a "defaultText" is defined in an option declaration if the type of
the option does not derive from "package", "packageSet" or "nixpkgsConfig".
- Warn if no "type" is defined in an option declaration.
2016-02-29 01:09:00 +01:00
Graham Christensen
7df907b272
moodle: 2.8.5 -> 2.8.10 for CVE-2016-0724 CVE-2016-0725
2016-02-27 17:22:14 -06:00
Domen Kožar
04422bb3ca
Merge pull request #8630 from lihop/nixos/fix-formatting
...
nixos: fix formatting of option examples
2016-02-27 10:08:37 +00:00
Vladimír Čunát
3cf9cd8bc3
Merge #12796 : nixos docs: show references to packages
...
(version 2) A better implementation of #10039 , after #12357 .
This time I did more thorough checking.
See commit messages for details.
2016-02-27 10:48:12 +01:00
Leroy Hopson
25fd9e31a2
phpfpm service: fix formatting of example
2016-02-27 22:25:40 +13:00
zimbatm
09c14170d8
Merge pull request #13125 from abbradar/uwsgi
...
Refactor uWSGI
2016-02-23 22:32:54 +00:00
zimbatm
a7715e3e06
Merge pull request #10231 from zimbatm/apache-intermediate-ssl
...
apache-httpd: adopt mozilla's SSL configuration recommendation
2016-02-20 19:14:51 +00:00
Nikolay Amiantov
b6c49abba0
uwsgi service: update documentation
2016-02-19 18:09:27 +03:00
Nikolay Amiantov
e48c991131
uwsgi service: refactor, throw more errors and drop simultaneous Python 2/3 in path
2016-02-19 18:09:26 +03:00
aszlig
7bdcfb33f4
nixos: Provide a defaultText for type = package
...
We don't want to build all those things along with the manual, so that's
what the defaultText attribute is for.
Unfortunately a few of them were missing, so let's add them.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-02-17 21:12:24 +01:00
Vladimír Čunát
d039c87984
Merge branch 'master' into closure-size
2016-02-14 08:33:51 +01:00
Eelco Dolstra
86c2a0f783
mediawiki: 1.23.9 -> 1.23.13
2016-02-11 11:24:44 +01:00
Vladimír Čunát
4fede53c09
nixos manuals: bring back package references
...
This reverts most of 89e983786a
, as those references are sanitized now.
Fixes #10039 , at least most of it.
The `sane` case wasn't fixed, as it calls a *function* in pkgs to get
the default value.
2016-02-03 14:47:14 +01:00
Vladimír Čunát
889351af8b
Revert "Merge #12357 : nixos docs: show references to packages"
...
The PR wasn't good enough yet.
This reverts commit b2a37ceeea
, reversing
changes made to 7fa9a1abce
.
2016-02-03 12:16:33 +01:00
Vladimír Čunát
b2a37ceeea
Merge #12357 : nixos docs: show references to packages
2016-02-03 10:07:27 +01:00
Tuomas Tynkkynen
13b3f3f246
treewide: Mass replace 'openssl}/bin' to refer the 'bin' output
2016-02-01 20:46:16 +02:00
Vladimír Čunát
716aac2519
Merge branch 'staging' into closure-size
2016-01-19 09:55:31 +01:00
Thomas Strobel
a04a7272aa
Add missing 'type', 'defaultText' and 'literalExample' in module definitions
...
- add missing types in module definitions
- add missing 'defaultText' in module definitions
- wrap example with 'literalExample' where necessary in module definitions
2016-01-17 19:41:23 +01:00
Vladimír Čunát
3bcf8ae879
nixos manuals: bring back package references
...
This reverts most of 89e983786a
, as those references are sanitized now.
Fixes #10039 , at least most of it.
The `sane` case wasn't fixed, as it calls a *function* in pkgs to get
the default value.
2016-01-13 12:04:31 +01:00
Sander van der Burg
b1d6e6a38b
Fix running apache tomcat as a daemon
2016-01-12 14:32:22 +00:00
Robin Gloster
88292fdf09
jobs -> systemd.services
2016-01-07 06:39:06 +00:00
Luca Bruno
5b0352a6a4
Merge branch 'master' into closure-size
2015-12-11 18:31:00 +01:00
Augustin Borsu
c17a60b636
owncloud httpd-service: add package option
...
Owncloud package used can now be set in configuration.nix using
package option.
2015-12-02 20:37:41 +01:00
Augustin Borsu
9d5bf282c7
owncloud httpd-service: fix trusted_domain when unset
...
When an empty string was given as trusted_domain, the trusted
domain was set to be empty string instead of not beeing set.
2015-12-02 20:37:33 +01:00
Augustin Borsu
16fd6c1cf0
owncloud: 7.0.5 -> 7.0.10 +
...
Commit changes default version to 7.0.10, 7.0.5 version is kept for
people reluctant to update. Needed info has also been added for
versions 8.0, 8.1 and 8.2 only the latest minor version of each
major version is included.
2015-12-02 20:36:40 +01:00
Augustin Borsu
e08ffc472c
owncloud httpd-service: add urlPrefix option
...
This option allows user to specify a url prefix for owncloud.
By default it is set to "" and the document root will be set
to owncloud's dir.
If a prefix is set, e.g. urlPrefix = "/owncloud"
an alias will be created using that prefix to point to owncloud's
dir and owncloud will be available at http://localhost/owncloud
2015-12-02 20:36:26 +01:00
Aristid Breitkreuz
0b9c4af74a
Merge pull request #11342 from basvandijk/wordpress-4.3.1
...
wordpress: 4.3 -> 4.3.1
2015-11-29 20:51:57 +01:00
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
Bas van Dijk
f48f916fd1
wordpress: 4.3 -> 4.3.1
2015-11-29 12:50:00 +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 #9733 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
zimbatm
f5f039eeb4
apache-httpd: harden default SSL cipher list
...
A couple of tweaks on the SSL cipher list.
Disabled RC4 which is now considered broken.
https://community.qualys.com/blogs/securitylabs/2013/03/19/rc4-in-tls-is-broken-now-what
Enabled Forward Secrecy for modern browsers.
https://en.wikipedia.org/wiki/Forward_secrecy
Without the change, NixOS servers are capped at Grade B on
https://www.ssllabs.com/ssltest/index.html
2015-10-05 17:19:53 +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 b01eebf021
)
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 #9103 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 #7605 from ip1981/wiki
...
Mediawiki updates
2015-04-28 19:00:27 +03:00
Jaka Hudoklin
7b878a7ca9
Merge pull request #7555 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 #7027 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 #6785 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 #6784 "
...
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 #6784
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 #5846 from arno01/nginx
...
nginx service improvements
2015-03-13 11:41:27 +01:00
lethalman
70527b87a1
Merge pull request #6440 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
Matej Cotman
3ed3977166
owncloud: make .htaccess available
2015-01-21 22:49:22 +01:00
Matej Cotman
7494bd389e
apache-httpd: add owncloud
2015-01-21 22:49:22 +01:00
Matej Cotman
6630e3e4fe
apache-httpd: add restartSec option
2015-01-21 22:49:22 +01:00
Andrey Arapov
b1b9efdbe1
nginx service improvements
...
Adding Restart, RestartSec, StartLimitInterval to ensure that the service
is started in case if it can't assign (bind) the address as often it takes longer
for the network (e.g. dhcpcd) to get the IP assigned.
2015-01-19 10:46:45 +01:00
William A. Kennington III
dd7efcbf36
java: More default cleanups
2015-01-07 14:55:41 -08:00
Tobias Geerinckx-Rice
c64257b8e5
Fix user-facing typos (mainly in descriptions)
2014-12-30 03:31:03 +01:00
Eelco Dolstra
cfe26e4438
Fix using Apache httpd 2.2
2014-12-15 13:13:17 +01:00
Nikolay Amiantov
d0773dae54
nixos/nginx: add more types
2014-12-10 04:45:10 +03:00
Igor Pashev
1dd53cc990
Mediawiki: updated for Apache 2.4
2014-11-26 16:51:30 +01:00
Longrin Wischnewski
490232bd2e
apache-httpd: add mod_access_compat for compatibility with old httpd-22 configurations
2014-11-12 13:18:02 +01:00
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
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