Commit Graph

9 Commits

Author SHA1 Message Date
peter-stadler f81ef30a30 nginx-util: fix dependency
Add DEPENDS since EXTRA_DEPENDS is not used by `make menuconfig`.

Signed-off-by: Peter Stadler <peter.stadler@student.uibk.ac.at>
2020-08-03 15:17:24 +02:00
Peter Stadler 3603f50fd5 nginx: enable ssl for all variants and remove nginx-util w/o ssl
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>
2020-07-25 17:36:28 +02:00
Peter Stadler 2d359a4556 nginx-util: fix issues and cleanup
* fix regex capture (to conform std)
* fix issues for Clang/libcxx (warnings/includes)
* fix CONFLICTS in the Makefile
* use /bin/sh in host scripts and shellcheck them
* add callback for setting arguments in ubus::call

Signed-off-by: Peter Stadler <peter.stadler@student.uibk.ac.at>
2020-05-26 18:36:03 +02:00
Peter Stadler d5dcbc3898 nginx-util: resolve recursive CONFLICTS
Plus change the TITLE that it fits.

Signed-off-by: Peter Stadler <peter.stadler@student.uibk.ac.at>
2020-02-12 18:16:47 +01:00
Peter Stadler e247efa254 nginx-util: add tests, clean up and fix issues
Add tests for nginx-ssl-util and nginx-ssl-util-nopcre using (fake)chroot.
Clean the code up making nginx-ssl-util a header file.
Both changes are for better (future) code quality only.

There are minor functional improvements:
* fix compiler error of gcc7 by using std=c++17
* fix error if there is no lan/loopback interface
* notice instead of error message if there is no default server
* add ipv6-prefix-assignment.*.local-address.address for LAN
* add CONFLICTS in Makefile for choosing the right version
* add cast to release of unique_ptr to avoid warning
* add version message to help message

Signed-off-by: Peter Stadler <peter.stadler@student.uibk.ac.at>
2020-02-09 13:02:54 +01:00
Peter Stadler 4b03122ce5 nginx-util: allow comments in begin of regex
Signed-off-by: Peter Stadler <peter.stadler@student.uibk.ac.at>
2020-02-03 17:18:09 +01:00
Peter Stadler f76f1e082d nginx-util: fix PROVIDES and issue #6905
nginx-ssl-util and nginx-ssl-util-nopcre are replacements for each other,
but cannot replace nginx-util (instead conflict with it).

The hard coded [::1] could lead to a nginx error if build without IPv6.
So, get the loopback addresses dynamically.

Signed-off-by: Peter Stadler <peter.stadler@student.uibk.ac.at>
2020-01-22 10:00:39 +01:00
Peter Stadler 5cd9d62f52 nginx-util: fix ubus::~iterator() and minor issues
* Do not destroy the iterator twice if cur==this (segfault).
* Do not add the delimiter clim=='\0' when creating the SSL directives.
* Set the right SSL_SESSION_CACHE_ARG for nginx-util get_env.
* Remove static from the constexpr that are used only for Line::build.
* Concat strings instead of appending them for not using a non-const ref
(to remove some warnings of clang-tidy -checks=google-runtime-references)

Signed-off-by: Peter Stadler <peter.stadler@student.uibk.ac.at>
2020-01-20 15:13:23 +01:00
Peter Stadler e054f34f74 nginx-util: add package
This can do the main work of nginx/nginx-ssl init script.
For nginx-ssl it can create selfsigned certificates, too.
It uses libpcre and libopenssl iff nginx(-ssl) uses them.

Signed-off-by: Peter Stadler <peter.stadler@student.uibk.ac.at>
2020-01-17 01:11:17 +01:00