dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

nginx: enable ktls support by default

Browse Source
This commit is contained in:
Izorkin 2023-12-31 18:12:40 +03:00
parent dc594fa5f6
commit 10c06cb060
No known key found for this signature in database
GPG Key ID: 1436C1B3F3679F09
2 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
nixos/modules/services/web-servers/nginx/default.nix
View File

@ -1132,14 +1132,6 @@ in
''; '';
} }
{
assertion = any (host: host.kTLS) (attrValues virtualHosts) -> versionAtLeast cfg.package.version "1.21.4";
message = ''
services.nginx.virtualHosts.<name>.kTLS requires nginx version
1.21.4 or above; see the documentation for services.nginx.package.
'';
}
{ {
assertion = all (host: !(host.enableACME && host.useACMEHost != null)) (attrValues virtualHosts); assertion = all (host: !(host.enableACME && host.useACMEHost != null)) (attrValues virtualHosts);
message = '' message = ''
@ -1348,6 +1340,8 @@ in
nginx.gid = config.ids.gids.nginx; nginx.gid = config.ids.gids.nginx;
}; };
boot.kernelModules = optional (versionAtLeast config.boot.kernelPackages.kernel.version "4.17") "tls";
# do not delete the default temp directories created upon nginx startup # do not delete the default temp directories created upon nginx startup
systemd.tmpfiles.rules = [ systemd.tmpfiles.rules = [
"X /tmp/systemd-private-%b-nginx.service-*/tmp/nginx_*" "X /tmp/systemd-private-%b-nginx.service-*/tmp/nginx_*"

2
pkgs/servers/http/nginx/generic.nix
View File

@ -4,7 +4,7 @@ outer@{ lib, stdenv, fetchurl, fetchpatch, openssl, zlib, pcre, libxml2, libxslt
, nixosTests , nixosTests
, installShellFiles, substituteAll, removeReferencesTo, gd, geoip, perl , installShellFiles, substituteAll, removeReferencesTo, gd, geoip, perl
, withDebug ? false , withDebug ? false
, withKTLS ? false , withKTLS ? true
, withStream ? true , withStream ? true
, withMail ? false , withMail ? false
, withPerl ? true , withPerl ? true