[ptxdist] [PATCH v2] lighttpd: make more modules configurable

["Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>]

This comes handy if a package installs config sniplets to
/etc/lighttpd/conf.d that require the respective modules.

The three modules that used to be the default for LIGHTTPD_MOD_EXTRA got
a "default y".

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
---
 rules/lighttpd.in   | 35 ++++++++++++++++++++++++++++++++++-
 rules/lighttpd.make |  5 +++++
 2 files changed, 39 insertions(+), 1 deletion(-)

diff --git a/rules/lighttpd.in b/rules/lighttpd.in
index 5e132f286ddb..aac0756bad3e 100644
--- a/rules/lighttpd.in
+++ b/rules/lighttpd.in
@@ -83,6 +83,33 @@ endmenu
 
 menu "modules                     "
 
+config LIGHTTPD_MOD_ACCESS
+	bool
+	prompt "mod_access"
+	default y
+	help
+	  Deny access to some files.
+
+config LIGHTTPD_MOD_ACCESSLOG
+	bool
+	prompt "mod_accesslog"
+	default y
+	help
+	  flexible logging of requests served
+
+config LIGHTTPD_MOD_ALIAS
+	bool
+	prompt "mod_alias"
+	help
+	  Specify a special document-root for a given url-subset.
+
+config LIGHTTPD_MOD_AUTH
+	bool
+	prompt "mod_auth"
+	default y
+	help
+	  User authentication
+
 config LIGHTTPD_MOD_CML
 	bool
 	select LIGHTTPD_LUA
@@ -136,6 +163,12 @@ config LIGHTTPD_MOD_MAGNET
 	help
 	  A module to control the request handling
 
+config LIGHTTPD_MOD_REWRITE
+	bool
+	prompt "mod_rewrite"
+	help
+	  Module for URL rewriting
+
 config LIGHTTPD_MOD_TRIGGER_B4_DL
 	bool
 	select LIGHTTPD_MEMCACHE
@@ -170,7 +203,7 @@ endif
 config LIGHTTPD_MOD_EXTRA
 	string
 	prompt "extra modules"
-	default "mod_access mod_accesslog mod_auth"
+	default ""
 	help
 	  Space sparated list of modules to add to lighttpd.conf
 
diff --git a/rules/lighttpd.make b/rules/lighttpd.make
index 2a1f19200877..60dc494d1120 100644
--- a/rules/lighttpd.make
+++ b/rules/lighttpd.make
@@ -63,10 +63,15 @@ LIGHTTPD_AUTOCONF := \
 # ----------------------------------------------------------------------------
 
 LIGHTTPD_MODULES-y :=
+LIGHTTPD_MODULES-$(PTXCONF_LIGHTTPD_MOD_ACCESS)		+= mod_access
+LIGHTTPD_MODULES-$(PTXCONF_LIGHTTPD_MOD_ACCESSLOG)	+= mod_accesslog
+LIGHTTPD_MODULES-$(PTXCONF_LIGHTTPD_MOD_ALIAS)		+= mod_alias
+LIGHTTPD_MODULES-$(PTXCONF_LIGHTTPD_MOD_AUTH)		+= mod_auth
 LIGHTTPD_MODULES-$(PTXCONF_LIGHTTPD_MOD_CML)		+= mod_cml
 LIGHTTPD_MODULES-$(PTXCONF_LIGHTTPD_MOD_COMPRESS)	+= mod_compress
 LIGHTTPD_MODULES-$(PTXCONF_LIGHTTPD_MOD_FASTCGI)	+= mod_fastcgi
 LIGHTTPD_MODULES-$(PTXCONF_LIGHTTPD_MOD_MAGNET)		+= mod_magnet
+LIGHTTPD_MODULES-$(PTXCONF_LIGHTTPD_MOD_REWRITE)	+= mod_rewrite
 LIGHTTPD_MODULES-$(PTXCONF_LIGHTTPD_MOD_TRIGGER_B4_DL)	+= mod_trigger_b4_dl
 LIGHTTPD_MODULES-$(PTXCONF_LIGHTTPD_MOD_WEBDAV)		+= mod_webdav
 LIGHTTPD_MODULES-y += $(call remove_quotes,$(PTXCONF_LIGHTTPD_MOD_EXTRA))
-- 
2.0.1


-- 
ptxdist mailing list
ptxdist@pengutronix.de