packages: nginx: clean up options

* Make all options enabling features (and default to y in case if
  they were previously disabling features).
* Add missing SSL dependencies to AUTH_BASIC and HTTP_CACHE, allowing
  them to be enabled/disabled independently.

Signed-off-by: Jonas Gorski <jogo@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/packages@36379 3c298f89-4303-0410-b956-a3cf2f4a3e73

net/nginx/Config.in

@@ -11,160 +11,150 @@ menu "Configuration"
 config NGINX_STUB_STATUS
 	bool
 	prompt "Enable stub status module"
-	default n
 	help
 		Enable the stub status module which gives some status from the server.
 
 config NGINX_FLV
 	bool
 	prompt "Enable FLV module"
-	default n
 	help
 		Provides the ability to seek within FLV (Flash) files using time-based offsets.
 
 config NGINX_SSL
 	bool
 	prompt "Enable SSL module"
-	default n
 	help
 		Enable HTTPS/SSL support.
 
 config NGINX_DAV
 	bool
 	prompt "Enable WebDAV module"
-	default n
 	help
 		Enable the HTTP and WebDAV methods PUT, DELETE, MKCOL, COPY and MOVE.
 
-config NGINX_MODULE_LUA
+config NGINX_LUA
 	bool
 	prompt "Enable LUA module"
-	default n
 	help
 		Enable support for LUA scripts.
 
-	menu "Disable features"
+config NGINX_DISABLE_PCRE
+	bool
+	prompt "Enable PCRE library usage"
+	default y
 
-	config NGINX_DISABLE_PCRE
-	      bool
-	      prompt "Disable PCRE library usage"
-	      default n
+config NGINX_HTTP_CACHE
+	bool
+	prompt "Enable HTTP cache"
 
-	config NGINX_DISABLE_HTTP_CACHE
-	      depends on NGINX_SSL=y
-	      bool
-	      prompt "Disable HTTP cache"
-	      default y
+config NGINX_HTTP_CHARSET
+	bool
+	prompt "Enable HTTP charset module"
+	default y
 
-	config NGINX_DISABLE_HTTP_CHARSET_MODULE
-	      bool
-	      prompt "Disable HTTP charset module"
-	      default n
+config NGINX_HTTP_GZIP
+	bool
+	prompt "Enable HTTP gzip module"
+	default y
 
-	config NGINX_DISABLE_HTTP_GZIP_MODULE
-	      bool
-	      prompt "Disable HTTP gzip module"
-	      default n
+config NGINX_HTTP_SSI
+	bool
+	prompt "Enable HTTP ssi module"
+	default y
 
-	config NGINX_DISABLE_HTTP_SSI_MODULE
-	      bool
-	      prompt "Disable HTTP ssi module"
-	      default n
+config NGINX_HTTP_USERID
+	bool
+	prompt "Enable HTTP userid module"
+	default y
 
-	config NGINX_DISABLE_HTTP_USERID_MODULE
-	      bool
-	      prompt "Disable HTTP userid module"
-	      default n
+config NGINX_HTTP_ACCESS
+	bool
+	prompt "Enable HTTP access module"
+	default y
 
-	config NGINX_DISABLE_HTTP_ACCESS_MODULE
-	      bool
-	      prompt "Disable HTTP access module"
-	      default n
+config NGINX_HTTP_AUTH_BASIC
+	bool
+	prompt "Enable HTTP auth basic"
+	default y
 
-	config NGINX_DISABLE_HTTP_AUTH_BASIC_MODULE
-	      bool
-	      prompt "Disable HTTP auth basic"
-	      default n
+config NGINX_HTTP_AUTOINDEX
+	bool
+	prompt "Enable HTTP autoindex module"
+	default y
 
-	config NGINX_DISABLE_HTTP_AUTOINDEX_MODULE
-	      bool
-	      prompt "Disable HTTP autoindex module"
-	      default n
+config NGINX_HTTP_GEO
+	bool
+	prompt "Enable HTTP geo module"
+	default y
 
-	config NGINX_DISABLE_HTTP_GEO_MODULE
-	      bool
-	      prompt "Disable HTTP geo module"
-	      default n
+config NGINX_HTTP_MAP
+	bool
+	prompt "Enable HTTP map module"
+	default y
 
-	config NGINX_DISABLE_HTTP_MAP_MODULE
-	      bool
-	      prompt "Disable HTTP map module"
-	      default n
+config NGINX_HTTP_SPLIT_CLIENTS
+	bool
+	prompt "Enable HTTP split clients"
+	default y
 
-	config NGINX_DISABLE_HTTP_SPLIT_CLIENTS_MODULE
-	      bool
-	      prompt "Disable HTTP split clients"
-	      default n
+config NGINX_HTTP_REFERER
+	bool
+	prompt "Enable HTTP referer module"
+	default y
 
-	config NGINX_DISABLE_HTTP_REFERER_MODULE
-	      bool
-	      prompt "Disable HTTP referer module"
-	      default n
+config NGINX_HTTP_REWRITE
+	bool
+	prompt "Enable HTTP rewrite module"
+	default y
 
-	config NGINX_DISABLE_HTTP_REWRITE_MODULE
-	      bool
-	      prompt "Disable HTTP rewrite module"
-	      default n
+config NGINX_HTTP_PROXY
+	bool
+	prompt "Enable HTTP proxy module"
+	default y
 
-	config NGINX_DISABLE_HTTP_PROXY_MODULE
-	      bool
-	      prompt "Disable HTTP proxy module"
-	      default n
+config NGINX_HTTP_FASTCGI
+	bool
+	prompt "Enable HTTP fastcgi module"
+	default y
 
-	config NGINX_DISABLE_HTTP_FASTCGI_MODULE
-	      bool
-	      prompt "Disable HTTP fastcgi module"
-	      default n
+config NGINX_HTTP_UWSGI
+	bool
+	prompt "Enable HTTP uwsgi module"
+	default y
 
-	config NGINX_DISABLE_HTTP_UWSGI_MODULE
-	      bool
-	      prompt "Disable HTTP uwsgi module"
-	      default n
+config NGINX_HTTP_SCGI
+	bool
+	prompt "Enable HTTP scgi module"
+	default y
 
-	config NGINX_DISABLE_HTTP_SCGI_MODULE
-	      bool
-	      prompt "Disable HTTP scgi module"
-	      default n
+config NGINX_HTTP_MEMCACHED
+	bool
+	prompt "Enable HTTP memcached module"
+	default y
 
-	config NGINX_DISABLE_HTTP_MEMCACHED_MODULE
-	      bool
-	      prompt "Disable HTTP memcached module"
-	      default n
+config NGINX_HTTP_LIMIT_CONN
+	bool
+	prompt "Enable HTTP limit conn"
+	default y
 
-	config NGINX_DISABLE_HTTP_LIMIT_CONN_MODULE
-	      bool
-	      prompt "Disable HTTP limit conn"
-	      default n
+config NGINX_HTTP_LIMIT_REQ
+	bool
+	prompt "Enable HTTP limit req"
+	default y
 
-	config NGINX_DISABLE_HTTP_LIMIT_REQ_MODULE
-	      bool
-	      prompt "Disable HTTP limit req"
-	      default n
+config NGINX_HTTP_EMPTY_GIF
+	bool
+	prompt "Enable HTTP empty gif"
+	default y
 
-	config NGINX_DISABLE_HTTP_EMPTY_GIF_MODULE
-	      bool
-	      prompt "Disable HTTP empty gif"
-	      default n
+config NGINX_HTTP_BROWSER
+	bool
+	prompt "Enable HTTP browser module"
+	default y
 
-	config NGINX_DISABLE_HTTP_BROWSER_MODULE
-	      bool
-	      prompt "Disable HTTP browser module"
-	      default n
+config NGINX_HTTP_UPSTREAM_IP_HASH
+	bool
+	prompt "Enable HTTP IP hash module"
+	default y
 
-	config NGINX_DISABLE_HTTP_UPSTREAM_IP_HASH_MODULE
-	      bool
-	      prompt "Disable HTTP IP hash module"
-	      default n
-
-	endmenu
 endmenu