Browse Source

nginx: make depencies more stricter

This should fix isse #54. It should no not be possible to select an
nginx subpackage without the appropriate module.

Signed-off-by: Thomas Heil <heil@terminal-consulting.de>
lilik-openwrt-22.03
Thomas Heil 11 years ago
parent
commit
17925c4e33
2 changed files with 10 additions and 7 deletions
  1. +4
    -1
      net/nginx/Config.in
  2. +6
    -6
      net/nginx/Makefile

+ 4
- 1
net/nginx/Config.in View File

@ -162,13 +162,15 @@ config NGINX_NAXSI
bool bool
prompt "Enable NAXSI module" prompt "Enable NAXSI module"
select PACKAGE_nginx-naxsi select PACKAGE_nginx-naxsi
default y
help help
Enable support for NAXSI WAF. Enable support for NAXSI WAF.
config NGINX_PROXYPROTOCOL config NGINX_PROXYPROTOCOL
bool bool
prompt "Enable NAXSI proxyprotocol"
prompt "Enable HAProxy proxyprotocol"
select PACKAGE_nginx-proxyprotocol select PACKAGE_nginx-proxyprotocol
default y
help help
Enable support for NAXSI WAF. Enable support for NAXSI WAF.
@ -176,6 +178,7 @@ config NGINX_SYSLOG
bool bool
prompt "Enable Syslog module" prompt "Enable Syslog module"
select PACKAGE_nginx-syslog select PACKAGE_nginx-syslog
default y
help help
Provides the ability log to a remote destination Provides the ability log to a remote destination


+ 6
- 6
net/nginx/Makefile View File

@ -252,8 +252,8 @@ endef
define Package/nginx-naxsi define Package/nginx-naxsi
MENU:=1 MENU:=1
$(call Package/nginx) $(call Package/nginx)
TITLE+= nginx-naxsi
DEPENDS:=nginx
TITLE:=nginx-naxsi
DEPENDS:=nginx @NGINX_NAXSI
endef endef
define Package/nginx-naxsi/description define Package/nginx-naxsi/description
@ -263,8 +263,8 @@ endef
define Package/nginx-proxyprotocol define Package/nginx-proxyprotocol
MENU:=1 MENU:=1
$(call Package/nginx) $(call Package/nginx)
TITLE+= nginx-proxyprotocol
DEPENDS:=nginx
TITLE:=nginx
DEPENDS:=nginx @NGINX_PROXYPROTOCOL
endef endef
define Package/nginx-proxyprotocol/description define Package/nginx-proxyprotocol/description
@ -274,8 +274,8 @@ endef
define Package/nginx-syslog define Package/nginx-syslog
MENU:=1 MENU:=1
$(call Package/nginx) $(call Package/nginx)
TITLE+= nginx-syslog
DEPENDS:=nginx
TITLE:=nginx-syslog
DEPENDS:=nginx @NGINX_SYSLOG
endef endef
define Package/nginx-syslog/description define Package/nginx-syslog/description


Loading…
Cancel
Save