The creation of the dummy package nginx creates some problem with dependency detection for the all-module variant. Reorganize the dependency and compile nginx before the the sub-variant.
Fixes#13275
Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
Make the plain nginx version the same as nginx-ssl.
In a further change we will replace nginx by a dummy package,
depending on +nginx-ssl instead. This allows a smooth upgrade.
For nginx-util leave the ssl and the ssl-nopcre versions only.
For nginx-mod-luci remove the duplicate ssl version.
Replace the removed packages by dummies for a smooth upgrade.
The dummy packages will be removed after a transition period.
Additionally, enable the http2 module for nginx-ssl by default
and cleanup the nginx.init file.
Signed-off-by: Peter Stadler <peter.stadler@student.uibk.ac.at>
Use the upstream value for NGX_MAX_PROCESSES (=1024) again.
So it is safe to use `worker_processes auto;` (which sets it to
the number of CPUs). Also use this directive in the conf instead
of calculating the number in the init and passing it as argument.
Signed-off-by: Peter Stadler <peter.stadler@student.uibk.ac.at>
If one file is a hard link to another, `mv` will not overwrite it;
`rm -f` the destinations beforehand.
Signed-off-by: Peter Stadler <peter.stadler@student.uibk.ac.at>
Instead of the default nginx.conf file this file is a small variant
without examples that enables the /etc/nginx/conf.d/ directory.
It will pull in all configuration files from the conf.d directory.
So, other packages can add their server parts in the conf.d directory
without modifying the main nginx.conf file (cf. #9860).
Changed also the default logging behavior:
error_log stderr; # the init forwards it to logd
access_log off;
See the updated documentation at:
https://openwrt.org/docs/guide-user/services/webserver/nginx
Signed-off-by: Peter Stadler <peter.stadler@student.uibk.ac.at>
Luci nginx config file for non ssl varian had user as nobody nogroup. This cause some problem with ubus use.
Luci file support package depends on uwsgi-cgi. As this package will be renamed shortly to a more generic version, make the subpackage depends on the uwsgi subpackage only.
Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
Current version of ubus module have some problem with list method. Update the module to fix this problem.
Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
- Adds ubus module to nginx
- Select module by default
- Adds script to detect ubus module and append config for luci
- Switch all external module to xz
Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
This removes lines that set PKG_BUILD_DIR when the set value is no
different from the default value.
Specifically, the line is removed if the assigned value is:
* $(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
The default PKG_BUILD_DIR was updated[1] to incorporate BUILD_VARIANT
if it is set, so now this is identical to the default value.
* $(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_SOURCE_SUBDIR)
if PKG_SOURCE_SUBDIR is set to $(PKG_NAME)-$(PKG_VERSION), making it
the same as the previous case
* $(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
This is the same as the default PKG_BUILD_DIR when there is no
BUILD_VARIANT.
* $(BUILD_DIR)/[name]-$(PKG_VERSION)
where [name] is a string that is identical to PKG_NAME
[1]: https://git.openwrt.org/?p=openwrt/openwrt.git;a=commit;h=e545fac8d968864a965edb9e50c6f90940b0a6c9
Signed-off-by: Jeffery To <jeffery.to@gmail.com>
Fixes:
when using HTTP/2 a client might cause excessive memory
consumption and CPU usage (CVE-2019-9511, CVE-2019-9513,
CVE-2019-9516).
Signed-off-by: DENG Qingfang <dengqf6@mail2.sysu.edu.cn>
Remove libopenssl dep from NGINX_HTTP_CACHE and NGINX_HTTP_AUTH_BASIC config flag
The documentation doesn't mention that openssl is required for this 2 modules. This also permit to use nginx no-ssl variant without libopenssl as this 2 module are selected by default. Also make OPENSSL_ENGINE flag a dep to recompile nginx on change of openssl compilation flag.
Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
Update to 1.15.8. Also use HTTPS
PKG_VERSION (nginx version) in 3rd-party modules tarball filename is dispensable and can be dropped to avoid unnecessary downloading
Signed-off-by: Deng Qingfang <dengqf6@mail2.sysu.edu.cn>
The original configure file mixed tab and space
characters as indentation, so use 4 spaces as the
default indentation character.
Add /etc/nginx/conf.d/*.conf as nginx additional configure
files. Then we can add individual conf file for other http
applications without modify the main nginx configure file.
Signed-off-by: James Qian <sotux82@gmail.com>
This bumps nginx to latest release, adds support for STREAM MODULE and bump rtmp version to fix a compilation error
Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
Patch that changes the order of some include files in ngx_rtp_cenc.c
that caused a compilation failure. Patch submitted upstream (#13).
Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com>
Nginx provide WebDAV methods PUT, DELETE, MKCOL, COPY, and MOVE with
http_dav_module. But most WebDAV clients that require additional WebDAV
methods (PROPFIND & OPTIONS) to operate. Add missing methods support
with Arutyunyan Roman (arutyunyan.roman@gmail.com)'s nginx-dav-ext-module.
(see: http://nginx.org/en/docs/http/ngx_http_dav_module.htmlhttps://github.com/arut/nginx-dav-ext-module)
Example config:
location / {
dav_methods PUT DELETE MKCOL COPY MOVE;
dav_ext_methods PROPFIND OPTIONS;
root /var/root/;
}
Signed-off-by: Ruixi Zhou <zhouruixi@gmail.com>
Florian Eckert
Daniel Golle
Ansuel Smith
Peter Stadler
peter-stadler
Huangbin Zhan
DENG Qingfang
Shane Peelar
Jeffery To
Jan Pavlinec
James Qian
Eneas U de Queiroz
Daniel Engberg
Ruixi Zhou