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 516f47efefc44a5465266fe4d72f9136147d2caf)
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