Commit Graph

471 Commits

Author SHA1 Message Date
ajs124
27d53b81cc nginxQuic: share src and version with nginxMainline
quic support was merged
still a separate package, because it uses quictls
and sets configureFlags
2023-05-23 18:37:54 +02:00
ajs124
91ecb7d7ff nginxMainline: 1.24.0 -> 1.25.0 2023-05-23 18:28:04 +02:00
Martin Weinelt
9d0bbc2c12
nginxModules.secure-token: 2020-08-28 -> 1.5 2023-05-22 16:29:55 +02:00
Martin Weinelt
2c1cc78307
nginxModules.vod: 1.29 -> 1.31 2023-05-22 16:29:55 +02:00
Jules Lamur
dcb2cc849e
nginx: fix build of module spnego-http-auth 2023-05-20 16:12:04 +02:00
zowoq
9f8b8befcf nginxModules.zstd: add missing meta 2023-05-04 20:21:37 +10:00
Sandro
7a4d8131fa
Merge pull request #208161 from SuperSandro2000/nginx-modules-meta
nginx: add meta section to modules
2023-05-04 00:59:20 +02:00
Sandro Jäckel
50b8c237b7
nginx: move aliases behind config.allowAliases 2023-04-28 21:38:43 +02:00
Sandro Jäckel
0d58522055
nginx: add meta section to modules
Also resolve one github redirect.
2023-04-28 21:38:43 +02:00
ajs124
68c39e6f41 nginxMainline: 1.23.4 -> 1.24.0 2023-04-11 22:12:12 +02:00
ajs124
58cb284c0e nginxStable: 1.22.1 -> 1.24.0 2023-04-11 22:11:07 +02:00
ajs124
8be794b197 nginx: sha256 -> hash 2023-04-03 12:40:49 +02:00
ajs124
9554582b34 nginxMainline: 1.23.3 -> 1.23.4 2023-04-03 12:29:54 +02:00
Izorkin
9f2a1d98aa
nginxQuic: 3be953161026 -> 0af598651e33 2023-04-01 13:09:48 +03:00
Sandro
995f9d1c95
Merge pull request #213874 from SuperSandro2000/nginx-zstd
nixos/nginx: add recommendedZstdSettings
2023-03-23 14:11:35 +01:00
Artturin
f9fdf2d402 treewide: move NIX_CFLAGS_COMPILE to the env attrset
with structuredAttrs lists will be bash arrays which cannot be exported
which will be a issue with some patches and some wrappers like cc-wrapper

this makes it clearer that NIX_CFLAGS_COMPILE must be a string as lists
in env cause a eval failure
2023-02-22 21:23:04 +02:00
Sandro Jäckel
e31461fff1
nginx.modules.zstd: init 2023-02-22 13:59:55 +01:00
Sandro
a68a88698f
Merge pull request #215150 from SuperSandro2000/nginx-with-lib
nginx: remove with lib over entire file
2023-02-15 16:22:35 +01:00
Henri Menke
2fb3714761 nginxModules.njs: 0.7.9 -> 0.7.10 2023-02-10 09:57:49 +01:00
Henri Menke
160472e179 nginxModules.njs: 0.7.8 -> 0.7.9 2023-02-10 09:52:56 +01:00
Sandro Jäckel
79a301305b
nginx: remove with lib over entire file 2023-02-07 17:25:15 +01:00
MayNiklas
3f4bbaee84 nginxModules.geoip2: 3.3 -> 3.4 2023-01-06 11:11:30 +01:00
Izorkin
f3e20dbfb0
nginxModules.brotli: unstable-2020-04-23 -> unstable-2022-04-29 2022-12-29 18:14:29 +03:00
Sandro
83d9cef104
Merge pull request #206814 from SuperSandro2000/nginxModules 2022-12-25 20:08:14 +01:00
Sandro
58abb21bbe
nginxModules.lua: replace all occurences
Co-authored-by: Naïm Favier <n@monade.li>
2022-12-25 20:08:01 +01:00
Ryan Lahfa
0ed43cb857
Merge pull request #201789 from RaitoBezarius/nginx-with-slice
nginx: expose ngx_http_slice_module through "withSlice"
2022-12-23 00:47:30 +01:00
Sandro
90cf235d3b
Merge pull request #206811 from SuperSandro2000/openresty 2022-12-22 03:08:45 +01:00
Sandro Jäckel
0e25cc73c8
nginxModules.lua: 0.10.15 -> 0.10.22 2022-12-19 08:46:48 +01:00
Sandro Jäckel
c2b2f29d2b
nginxModules.pagespeed: cleanup 2022-12-19 08:46:11 +01:00
Sandro Jäckel
a7f34992d5
nginxModules: make single packages overridable 2022-12-19 08:45:48 +01:00
Sandro Jäckel
7f2d5f369c
openresty: 1.19.9 -> 1.21.4 2022-12-19 08:38:48 +01:00
Vincent Bernat
fc39b5ecc8 nginx: make global redirect vhost option accept exceptions
By moving the return into a location directive, one can provide
exceptions by adding locations. This is similar to what the forceSSL
option does.
2022-12-18 12:21:27 +01:00
Raito Bezarius
9105bfd039 nginx: expose ngx_http_slice_module through "withSlice" 2022-12-17 02:59:04 +01:00
Naïm Favier
dc644c312f
Merge pull request #206061 from ncfavier/nginx-duplicate-modules 2022-12-16 10:09:19 +01:00
Naïm Favier
6c61c436cf
nginx: detect duplicate modules
Nginx breaks at runtime when duplicate modules are added. To detect
this, add a `name` key to all modules.

Also remove the outdated modsecurity v2 module and unify `modsecurity`
and `modsecurity-nginx`.
2022-12-16 01:57:14 +01:00
Franz Pletz
533ee91117
nginxMainline: 1.23.2 -> 1.23.3 2022-12-14 12:55:03 +01:00
Alexander Bantyev
df85dda331
Merge pull request #198314 from Izorkin/update-nginx-cache
nixos/nginx: add proxyCache options
2022-11-27 18:51:09 +04:00
Henri Menke
9ab02e1ec6
nginxModules.njs: init at 0.7.8 2022-11-05 21:40:57 +01:00
Izorkin
544c526393
nginx: change temp path location
Parameters `http-log-path`, `http-client-body-temp-path`, `http-proxy-temp-path`,
`http-fastcgi-temp-path`, `http-uwsgi-temp-path` and `http-scgi-temp-path`
point to location of nginx temporary files, not cache files.
To change specify location of cache files needed use other parameters
in nginx.conf configuration file.
2022-10-28 19:01:23 +03:00
Izorkin
9d676cb01d
nginxQuic: 3550b00d9dc8 -> 3be953161026 2022-10-20 22:10:09 +03:00
Izorkin
a9cbc65ad0
nginxMainline: 1.23.1 -> 1.23.2 2022-10-20 22:07:08 +03:00
Izorkin
2392241c0b
nginxStable: 1.22.0 -> 1.22.1 2022-10-20 22:05:06 +03:00
Sandro Jäckel
f240b7026c
nginxModules.vts: 0.2.0 -> 0.2.1 2022-09-25 01:36:21 +02:00
Sandro Jäckel
96398396eb
nginxModules.vts: 0.1.18 -> 0.2.0 2022-09-07 00:46:48 +02:00
Sandro Jäckel
9f86d199b4
nginx: bump moreheaders to fix coredump with nginx 1.23 2022-08-07 15:28:50 +02:00
Izorkin
a09d4826e1
nginxQuic: 8d0753760546 -> 3550b00d9dc8 2022-07-29 20:31:43 +03:00
Izorkin
ba7d7192f5
nginxMainline: 1.23.0 -> 1.23.1 2022-07-29 20:31:43 +03:00
Izorkin
ccff32fa91
nginxModules.moreheaders: v0.33 -> unstable-2022-06-21 2022-06-29 22:39:13 +03:00
Izorkin
ec443943f5
nginxQuic: 5b1011b5702b -> 8d0753760546 2022-06-29 22:39:13 +03:00
Izorkin
7a8c541412
nginxMainline: 1.22.0 -> 1.23.0 2022-06-29 22:39:13 +03:00
Izorkin
0a8f89e23e
nginxModules.modsecurity-nginx: 1.0.2 -> 1.0.3 2022-06-15 00:28:10 +03:00
ajs124
c26e3354a7 nginxQuic: update 2022-05-30 11:58:28 +02:00
ajs124
b484952330 nginx(Stable|Mainline|Quic): use pcre2 2022-05-30 11:58:28 +02:00
ajs124
893214cd0e nginxMainline: 1.21.6 -> 1.22.0 2022-05-30 11:58:28 +02:00
ajs124
14ef375cf0 nginxStable: 1.20.2 -> 1.22.0 2022-05-30 11:58:28 +02:00
ajs124
703280d031
Merge pull request #173721 from waldheinz/nginx-module-sources
nginx: take care not to pull in module sources as runtime deps
2022-05-24 15:40:09 +02:00
Izorkin
6e8e1faabe
nixos/tests: add nginx-http3 test 2022-05-22 19:29:12 +03:00
Matthias Treydte
ecb166b3e3 nginx: simplify the postInstall phase
Per suggestion from @ajs124, we can rely on the
"move-sbin" setup hook to move the executable
to $out/bin instead of doing it manually and
simplify accoringly.
2022-05-22 10:35:51 +02:00
Matthias Treydte
2fd6e6e264 nginx: take care not to pull in module sources as runtime deps
Nginx likes to print the "configured with ..." stuff on startup,
containing the full configure command line. When built with
modules (which it seems to be by default), this causes the
module sources to appear as runtime dependencies. So just use
the remove-references-to script to patch those out.

For a default installation, the rtmp, dav and moreheaders
module sources are gone, for special cases potentially more.
2022-05-20 09:29:45 +02:00
Dmitry Bogatov
aa9eb4509c
nginx-doc-unstable: init at 2022-05-05
Build documentation of nginx (which is maintained separately from webserver
itself) and make it available both as "nginx-doc" attribute and as "doc" output
of "nginx" derivation.
2022-05-11 21:38:04 -04:00
Dmitry Bogatov
c92ef7a135
nginx: build offline documentation 2022-05-11 21:38:04 -04:00
Vladimír Čunát
a97a00fceb
nginx: fixup build with other than gcc11
This parameter isn't known by clang or older gcc,
and that breaks compilation there:
https://hydra.nixos.org/build/174714339
https://hydra.nixos.org/build/174713306

Flag was added in commit 6508304a in PR #170102.
2022-04-25 07:45:16 +02:00
Izorkin
6508304a88
nginxModules.vts: fix build on gcc11 2022-04-24 18:20:37 +03:00
Robert Scott
6951ba02f4 nginxStable: add patch for CVE-2021-3618 2022-04-16 17:18:05 +01:00
Izorkin
79d107f858
nginxQuic: 6f8253673669 -> 55b38514729b 2022-03-10 14:03:15 +03:00
Alyssa Ross
cab0dd3777 nginxMainline: 1.21.5 -> 1.21.6 2022-03-09 11:14:53 +00:00
Izorkin
b672e4dd2c
nginxModules: add option disableIPC
The disableIPC option is required to checking enabled nginxModules
and disable the SystemCallFilter IPC filter.
2022-03-08 14:37:11 +03:00
Izorkin
842d0d9ed7
nginxModules.modsecurity-nginx: 1.0.1 -> 1.0.2 2022-02-14 16:19:10 +03:00
Pablo Ovelleiro Corral
0a6388d7b6
nginxModules.geoip2: init at 3.3 (#157699)
* Add nginxModules.geoip2
2022-02-06 14:25:41 +01:00
Sandro
27cccd4e49
Merge pull request #151363 from Stunkymonkey/doc-updateWalker 2022-01-27 14:06:36 +01:00
Felix Buehler
ed7bf9452c treewide: remove *.upstream files from updateWalker 2022-01-26 21:46:07 +01:00
Sandro
188fd378d3
Merge pull request #134332 from fufexan/auth-a2aclr 2022-01-26 12:12:47 +01:00
Janne Heß
75a8b258eb
nginxQuic: 10522e8dea41 -> 6f8253673669
This fixes a bug where the connection would hang indefinitely when more
than 3999 bytes are transmitted from proxy_pass.

Was introduced in 6ccf3867959a as in:
https://mailman.nginx.org/archives/list/nginx-devel@nginx.org/thread/C5CPKFVKLTI5WDNF7CV7MMK6G3POBBA3/
2022-01-13 16:58:34 +01:00
ajs124
b8512aa7f5
Merge pull request #152566 from Izorkin/update-nginx
Update nginx packages
2022-01-10 00:59:07 +01:00
Aneesh Agrawal
ca90544f45 nginx-fancyindex: v0.4.4 -> v0.5.2
Add myself (aneeshusa) as a maintainer.
2022-01-02 20:55:16 -05:00
Izorkin
77549658a6
nginxQuic: 0ee56d2eac44 -> 10522e8dea41 2021-12-31 22:48:06 +03:00
Izorkin
5cecafbc93
nginxMainline: 1.21.4 -> 1.21.5 2021-12-31 22:48:01 +03:00
7c6f434c
b0f154fd44
Merge pull request #147027 from Izorkin/update-nginx-ktls
nginxMainline: enable ktls support
2021-12-24 10:23:17 +00:00
Izorkin
921a58b8bc
nginxQuic: 6d1488b62dc5 -> 0ee56d2eac44 2021-12-09 14:23:11 +03:00
Janne Heß
b9811a5aeb
nginxModules.pam: 1.5.2 -> 1.5.3
This fixes deny statements:
https://github.com/sto/ngx_http_auth_pam_module/issues/25
2021-12-05 21:24:22 +01:00
Izorkin
532cd57bda
nginxMainline: enable ktls support 2021-11-27 09:39:56 +03:00
ajs124
1fc113f0df nginxStable: 1.20.1 -> 1.20.2 2021-11-16 17:17:12 +01:00
Thiago Kenji Okada
1950b7d6f0
Merge pull request #123881 from zaninime/ffmpeg-nginx-mod
nginxModules.video-thumbextractor: update to unstable and switch to ffmpeg_4
2021-11-13 21:54:33 -03:00
ajs124
ffa6cb97ff nginxMainline: use openssl_3_0 2021-11-05 13:11:23 +01:00
ajs124
16873acde8 nginxMainline: 1.21.3 -> 1.21.4 2021-11-05 13:11:23 +01:00
Maciej Krüger
99cdb84b4b
nginxQuic: 404de224517e -> 6d1488b62dc5 2021-10-26 23:08:32 +02:00
Bruno Bigras
69b01e3a22
Merge pull request #141408 from bbigras/openresty-lua
nixos/nginx: disable MemoryDenyWriteExecute for pkgs.openresty
2021-10-24 17:39:27 +00:00
wackbyte
2d78d99772
nginxModules.vod: update to 1.29 and switch ffmpeg_3 to ffmpeg (#142114)
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2021-10-18 21:24:27 +02:00
Maciej Krüger
d2e869a55e
nginxQuic: 5b0c229ba5fe -> 404de224517e 2021-10-18 14:41:31 +02:00
Bruno Bigras
feb47656e4 nixos/tests/openresty-lua: test openresty with lua
related to #140655
2021-10-14 07:01:56 -04:00
Naïm Favier
99805ce167
nginxModules.upload: init at 2.3.0 2021-10-09 12:51:19 +02:00
James Kay
c5d8765113
nginx: fix URLs by taking from a specific commit
I'm not sure this is the best way to get these patches, but it's better than `master` (at commit `e9617f553284b170a8b520d051ac1fc1b83cff30` on `nginx` these patches moved into a `nginx` subdirectory, breaking the build unless the patches are cached).
2021-09-21 00:14:35 +01:00
ajs124
2e8211af78 nginxMainline: 1.21.1 -> 1.21.3
- adds openssl 3 support
- disables support for export ciphers
and more
2021-09-10 16:40:04 +02:00
Mihai Fufezan
f5bbf7c66c
nginxModules: add auth-a2aclr 2021-09-02 12:07:27 +03:00
Mihai Fufezan
8e29eb27f5
nginxModules: format 2021-09-02 12:05:51 +03:00
Robert Hensing
fbafeb7ad5 treewide: runCommandNoCC -> runCommand
This has been synonymous for ~5y.
2021-08-15 17:36:41 +02:00
Sandro
87af92267a
Merge pull request #129694 from helsinki-systems/upd/nginx
nginxMainline: 1.21.0 -> 1.21.1
2021-07-09 12:43:37 +02:00
ajs124
95805c3240 nginxQuic: 1fec68e322d0 -> 5b0c229ba5fe 2021-07-08 23:44:27 +02:00
ajs124
b50102b719 nginxMainline: 1.21.0 -> 1.21.1 2021-07-08 23:41:30 +02:00
Alvar Penning
3690ae13a4 nginxModules.rtmp: 1.2.1 -> 1.2.2
This new release fixes segfaults,
https://github.com/arut/nginx-rtmp-module/compare/v1.2.1...v1.2.2
2021-06-21 20:04:10 +02:00