lede-packages-rs

commit 17925c4e3377d4eee94301b1dc8e1698a016e098
parent af1fe70acb5d2f4c9253440a101166f9f6cbbeb5
Author: Thomas Heil <heil@terminal-consulting.de>
Date:   Tue, 24 Jun 2014 01:31:49 +0200

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>

Diffstat:
M
net/nginx/Config.in
 | 
5
++++-
M
net/nginx/Makefile
 | 
12
++++++------

2 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/net/nginx/Config.in b/net/nginx/Config.in
@@ -162,13 +162,15 @@ config NGINX_NAXSI
 	bool
 	prompt "Enable NAXSI module"
 	select PACKAGE_nginx-naxsi
+	default y
 	help
 		Enable support for NAXSI WAF.
 
 config NGINX_PROXYPROTOCOL
 	bool
-	prompt "Enable NAXSI proxyprotocol"
+	prompt "Enable HAProxy proxyprotocol"
 	select PACKAGE_nginx-proxyprotocol
+	default y
 	help
 		Enable support for NAXSI WAF.
 
@@ -176,6 +178,7 @@ config NGINX_SYSLOG
 	bool
 	prompt "Enable Syslog module"
 	select PACKAGE_nginx-syslog
+	default y
 	help
 		Provides the ability log to a remote destination
 
diff --git a/net/nginx/Makefile b/net/nginx/Makefile
@@ -252,8 +252,8 @@ endef
 define Package/nginx-naxsi
         MENU:=1
         $(call Package/nginx)
-        TITLE+= nginx-naxsi
-        DEPENDS:=nginx
+        TITLE:=nginx-naxsi
+        DEPENDS:=nginx @NGINX_NAXSI
 endef
 
 define Package/nginx-naxsi/description
@@ -263,8 +263,8 @@ endef
 define Package/nginx-proxyprotocol
         MENU:=1
         $(call Package/nginx)
-        TITLE+= nginx-proxyprotocol
-        DEPENDS:=nginx
+        TITLE:=nginx 
+        DEPENDS:=nginx @NGINX_PROXYPROTOCOL
 endef
 
 define Package/nginx-proxyprotocol/description
@@ -274,8 +274,8 @@ endef
 define Package/nginx-syslog
         MENU:=1
         $(call Package/nginx)
-        TITLE+= nginx-syslog
-        DEPENDS:=nginx
+        TITLE:=nginx-syslog
+        DEPENDS:=nginx @NGINX_SYSLOG
 endef
 
 define Package/nginx-syslog/description