diff options
author | Kim Lindberger <kim.lindberger@gmail.com> | 2021-04-14 17:42:01 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-04-14 17:42:01 +0200 |
commit | 59917dc3a9012fa74a127cd5b107a45c711942be (patch) | |
tree | d005e424707e369512eb3feb1499283acde2f915 | |
parent | 6dff63294a8bd264c8b93f89c721022de2abb072 (diff) | |
parent | 4aab79918e8bd911a2ba859113b0e6e3b9f3e923 (diff) | |
download | nixpkgs-59917dc3a9012fa74a127cd5b107a45c711942be.tar nixpkgs-59917dc3a9012fa74a127cd5b107a45c711942be.tar.gz nixpkgs-59917dc3a9012fa74a127cd5b107a45c711942be.tar.bz2 nixpkgs-59917dc3a9012fa74a127cd5b107a45c711942be.tar.lz nixpkgs-59917dc3a9012fa74a127cd5b107a45c711942be.tar.xz nixpkgs-59917dc3a9012fa74a127cd5b107a45c711942be.tar.zst nixpkgs-59917dc3a9012fa74a127cd5b107a45c711942be.zip |
Merge pull request #119427 from talyz/tengine-modules
tengine: Add modules to passthru
-rw-r--r-- | nixos/modules/services/web-servers/nginx/default.nix | 2 | ||||
-rw-r--r-- | pkgs/servers/http/nginx/generic.nix | 5 | ||||
-rw-r--r-- | pkgs/servers/http/tengine/default.nix | 7 |
3 files changed, 11 insertions, 3 deletions
diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix index ea745eabf78..7591ad0c3d2 100644 --- a/nixos/modules/services/web-servers/nginx/default.nix +++ b/nixos/modules/services/web-servers/nginx/default.nix @@ -818,7 +818,7 @@ in ProtectControlGroups = true; RestrictAddressFamilies = [ "AF_UNIX" "AF_INET" "AF_INET6" ]; LockPersonality = true; - MemoryDenyWriteExecute = !(builtins.any (mod: (mod.allowMemoryWriteExecute or false)) (optionals (cfg.package ? modules) cfg.package.modules)); + MemoryDenyWriteExecute = !(builtins.any (mod: (mod.allowMemoryWriteExecute or false)) cfg.package.modules); RestrictRealtime = true; RestrictSUIDSGID = true; PrivateMounts = true; diff --git a/pkgs/servers/http/nginx/generic.nix b/pkgs/servers/http/nginx/generic.nix index d249d47a215..663193789a5 100644 --- a/pkgs/servers/http/nginx/generic.nix +++ b/pkgs/servers/http/nginx/generic.nix @@ -142,7 +142,10 @@ stdenv.mkDerivation { passthru = { modules = modules; - tests.nginx = nixosTests.nginx; + tests = { + inherit (nixosTests) nginx nginx-auth nginx-etag nginx-pubhtml nginx-sandbox nginx-sso; + variants = lib.recurseIntoAttrs nixosTests.nginx-variants; + }; }; meta = if meta != null then meta else { diff --git a/pkgs/servers/http/tengine/default.nix b/pkgs/servers/http/tengine/default.nix index 01e5c0950dc..d7c8ea226fe 100644 --- a/pkgs/servers/http/tengine/default.nix +++ b/pkgs/servers/http/tengine/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, openssl, zlib, pcre, libxml2, libxslt -, substituteAll, gd, geoip, gperftools, jemalloc +, substituteAll, gd, geoip, gperftools, jemalloc, nixosTests , withDebug ? false , withMail ? false , withStream ? false @@ -111,6 +111,11 @@ stdenv.mkDerivation rec { mv $out/sbin $out/bin ''; + passthru = { + inherit modules; + tests = nixosTests.nginx-variants.tengine; + }; + meta = { description = "A web server based on Nginx and has many advanced features, originated by Taobao"; homepage = "https://tengine.taobao.org"; |