lighttpd: rework options and configuration

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>

2 files changed, 131 insertions, 61 deletions

diff --git a/rules/lighttpd.in b/rules/lighttpd.in
index d84fec79f..bda88be75 100644
--- a/rules/lighttpd.in
+++ b/rules/lighttpd.in
@@ -20,6 +20,7 @@ menuconfig LIGHTTPD
 	select LIBMEMCACHE		if LIGHTTPD_MEMCACHE
 	select LUA			if LIGHTTPD_LUA
 	select LUA_INSTALL_LIBLUA	if LIGHTTPD_LUA
+	select PHP5			if LIGHTTPD_MOD_FASTCGI_PHP && RUNTIME
 	select BUSYBOX_START_STOP_DAEMON			if LIGHTTPD_STARTSCRIPT
 	select BUSYBOX_FEATURE_START_STOP_DAEMON_FANCY		if LIGHTTPD_STARTSCRIPT
 	select BUSYBOX_FEATURE_START_STOP_DAEMON_LONG_OPTIONS	if LIGHTTPD_STARTSCRIPT
@@ -40,34 +41,31 @@ menuconfig LIGHTTPD
 
 if LIGHTTPD
 
-config LIGHTTPD_ZLIB
-	bool
-	prompt "zlib support"
-	help
-	  Enable zlib support for mod_compress.
+menu "base settings               "
 
-config LIGHTTPD_BZ2LIB
+config LIGHTTPD_ATTR
 	bool
-	prompt "bz2lib support"
+	prompt "extended attribute support"
 	help
-	  Enable bzip2 support for mod_compress.
+	  Enable extended attribute support.
 
-config LIGHTTPD_MYSQL
+config LIGHTTPD_FAM
 	bool
-#	prompt "MySQL support"
+	prompt "fam"
 	help
+	  fam/gamin for reducing number of stat() calls.
 
-config LIGHTTPD_LDAP
+config LIGHTTPD_LUA
 	bool
-#	prompt "ldap"
+	prompt "lua engine"
 	help
-	  Enable LDAP support.
+	  lua engine for mod_cml and mod_magnet
 
-config LIGHTTPD_ATTR
+config LIGHTTPD_MEMCACHE
 	bool
-	prompt "extended attribute support"
+	prompt "memcached storage"
 	help
-	  Enable extended attribute support.
+	  memcached storage for mod_trigger_b4_dl and mod_cml
 
 config LIGHTTPD_OPENSSL
 	bool
@@ -75,13 +73,6 @@ config LIGHTTPD_OPENSSL
 	help
 	  Include openssl support.
 
-config LIGHTTPD_KERBEROS
-	bool
-	select LIGHTTPD_OPENSSL
-#	prompt "kerberos5 support"
-	help
-	  Use Kerberos5 support with OpenSSL.
-
 config LIGHTTPD_PCRE
 	bool
 	select LIBPCRE
@@ -89,11 +80,79 @@ config LIGHTTPD_PCRE
 	help
 	  Enable pcre support.
 
-config LIGHTTPD_FAM
+endmenu
+
+menu "modules                     "
+
+config LIGHTTPD_MOD_CML
 	bool
-	prompt "fam"
+	select LIGHTTPD_LUA
+	prompt "mod_cml"
 	help
-	  fam/gamin for reducing number of stat() calls.
+	  Cache Meta Language
+
+config LIGHTTPD_MOD_COMPRESS
+	bool
+	prompt "mod_compress"
+	help
+	  Output compression support.
+
+if LIGHTTPD_COMPRESS
+
+config LIGHTTPD_ZLIB
+	bool
+	prompt "zlib support"
+	help
+	  Enable zlib support for mod_compress.
+
+config LIGHTTPD_BZ2LIB
+	bool
+	prompt "bz2lib support"
+	help
+	  Enable bzip2 support for mod_compress.
+endif
+
+config LIGHTTPD_MOD_FASTCGI
+	bool
+	prompt "mod_fastcgi"
+
+if LIGHTTPD_MOD_FASTCGI
+
+config LIGHTTPD_MOD_FASTCGI_PHP
+	bool
+	prompt "setup php handling with fastcgi"
+	help
+	  Enables the necessary packages and configuration files
+	  to enable PHP support in lighttpd
+
+comment "PHP CGI SAPI must be enabled"
+	depends on LIGHTTPD_MOD_FASTCGI_PHP && !PHP5_SAPI_CGI
+
+endif
+
+config LIGHTTPD_MOD_MAGNET
+	bool
+	select LIGHTTPD_LUA
+	prompt "mod_magnet"
+	help
+	  A module to control the request handling
+
+config LIGHTTPD_MOD_TRIGGER_B4_DL
+	bool
+	select LIGHTTPD_MEMCACHE
+	select LIGHTTPD_PCRE
+	prompt "mod_trigger_b4_dl"
+	help
+	  Module for Anti Hotlinking
+
+config LIGHTTPD_MOD_WEBDAV
+	bool
+	prompt "mod_webdav"
+	help
+	  The WebDAV module is a very minimalistic implementation of RFC 2518.
+	  Minimalistic means that not all operations are implemented yet.
+
+if LIGHTTPD_MOD_WEBDAV
 
 config LIGHTTPD_WEBDAV_PROPS
 	bool
@@ -107,24 +166,24 @@ config LIGHTTPD_WEBDAV_LOCKS
 	prompt "locks in mod_webdav"
 	help
 	  locks in mod_webdav
+endif
 
-config LIGHTTPD_GDBM
-	bool
-#	prompt "gdbm storage for mod_trigger_b4_dl"
+config LIGHTTPD_MOD_EXTRA
+	string
+	prompt "extra modules"
+	default "mod_access mod_accesslog mod_auth"
 	help
-	  gdbm storage for mod_trigger_b4_dl
+	  Space sparated list of modules to add to lighttpd.conf
 
-config LIGHTTPD_MEMCACHE
-	bool
-	prompt "memcached storage for mod_trigger_b4_dl"
-	help
-	  memcached storage for mod_trigger_b4_dl
+comment "-----------------------------"
 
-config LIGHTTPD_LUA
+config LIGHTTPD_INSTALL_SELECTED_MODULES
 	bool
-	prompt "lua engine for mod_cml"
-	help
-	  lua engine for mod_cml
+	prompt "only install selected modules"
+
+endmenu
+
+menu "startup                     "
 
 config LIGHTTPD_STARTSCRIPT
 	bool
@@ -137,6 +196,8 @@ config LIGHTTPD_SYSTEMD_UNIT
 	depends on SYSTEMD
 	prompt "install systemd unit files for lighttpd"
 
+endmenu
+
 config LIGHTTPD_GENERIC_SITE
 	bool
 	default y
@@ -146,5 +207,4 @@ config LIGHTTPD_GENERIC_SITE
 	  from <ptxdist-install>/generic/var/www/lighttpd.html
 	  and some php demos.
 
-
 endif
diff --git a/rules/lighttpd.make b/rules/lighttpd.make
index 27860dd35..d47e04545 100644
--- a/rules/lighttpd.make
+++ b/rules/lighttpd.make
@@ -42,19 +42,19 @@ LIGHTTPD_AUTOCONF := \
 	$(GLOBAL_IPV6_OPTION) \
 	--disable-mmap \
 	--without-libev \
-	--$(call ptx/wwo, PTXCONF_LIGHTTPD_MYSQL)-mysql \
-	--$(call ptx/wwo, PTXCONF_LIGHTTPD_LDAP)-ldap \
+	--without-mysql \
+	--without-ldap \
 	--$(call ptx/wwo, PTXCONF_LIGHTTPD_ATTR)-attr \
 	--without-valgrind \
 	--$(call ptx/wwo, PTXCONF_LIGHTTPD_OPENSSL)-openssl \
-	--$(call ptx/wwo, PTXCONF_LIGHTTPD_KERBEROS)-kerberos5 \
+	--without-kerberos5 \
 	--$(call ptx/wwo, PTXCONF_LIGHTTPD_PCRE)-pcre \
 	--$(call ptx/wwo, PTXCONF_LIGHTTPD_ZLIB)-zlib \
 	--$(call ptx/wwo, PTXCONF_LIGHTTPD_BZ2LIB)-bzip2 \
 	--$(call ptx/wwo, PTXCONF_LIGHTTPD_FAM)-fam \
 	--$(call ptx/wwo, PTXCONF_LIGHTTPD_WEBDAV_PROPS)-webdav-props \
 	--$(call ptx/wwo, PTXCONF_LIGHTTPD_WEBDAV_LOCKS)-webdav-locks \
-	--$(call ptx/wwo, PTXCONF_LIGHTTPD_GDBM)-gdbm \
+	--without-gdbm \
 	--$(call ptx/wwo, PTXCONF_LIGHTTPD_MEMCACHE)-memcache \
 	--$(call ptx/wwo, PTXCONF_LIGHTTPD_LUA)-lua
 
@@ -62,6 +62,20 @@ LIGHTTPD_AUTOCONF := \
 # Target-Install
 # ----------------------------------------------------------------------------
 
+LIGHTTPD_MODULES-y :=
+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_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))
+
+LIGHTTPD_MODULE_STRING := $(subst $(space),\\$(comma),$(addsuffix \",$(addprefix \",$(LIGHTTPD_MODULES-y))))
+
+# add modules that are always loaded
+LIGHTTPD_MODULES_INSTALL := mod_indexfile mod_dirlisting mod_staticfile $(LIGHTTPD_MODULES-y)
+
 $(STATEDIR)/lighttpd.targetinstall:
 	@$(call targetinfo)
 
@@ -77,29 +91,25 @@ $(STATEDIR)/lighttpd.targetinstall:
 	@$(call install_copy, lighttpd, 0, 0, 0755, -, \
 		/usr/sbin/lighttpd-angel)
 
+ifdef PTXCONF_LIGHTTPD_INSTALL_SELECTED_MODULES
+	@$(foreach mod,$(LIGHTTPD_MODULES_INSTALL), \
+		$(call install_lib, lighttpd, 0, 0, 0644, lighttpd/$(mod));)
+else
 #	# modules
-	@cd $(LIGHTTPD_PKGDIR) && \
-		find ./usr/lib -name "*.so" | \
-		while read file; do \
-		$(call install_copy, lighttpd, 0, 0, 0644, -, \
-			$${file##.}) \
-	done
+	@$(call install_tree, lighttpd, 0, 0, -, /usr/lib/lighttpd)
+endif
 
 #	#
 #	# configs
 #	#
-	@$(call install_alternative, lighttpd, 0, 0, 0644, /etc/lighttpd/lighttpd.conf)
-
-	@$(call install_replace, lighttpd, /etc/lighttpd/lighttpd.conf, \
-		@CGI@, $(call ptx/ifdef, PTXCONF_PHP5_SAPI_CGI,,#))
-
+	@$(call install_alternative, lighttpd, 0, 0, 0644, \
+		/etc/lighttpd/lighttpd.conf)
 	@$(call install_replace, lighttpd, /etc/lighttpd/lighttpd.conf, \
-		@NOCGI@, $(call ptx/ifdef, PTXCONF_PHP5_SAPI_CGI,#,))
+		@MODULES@, $(LIGHTTPD_MODULE_STRING))
 
-ifdef PTXCONF_PHP5_SAPI_CGI
-	@$(call install_copy, lighttpd, 12, 102, 0644, \
-		$(PTXDIST_TOPDIR)/generic/etc/lighttpd/mod_fastcgi.conf, \
-		/etc/lighttpd/mod_fastcgi.conf)
+ifdef PTXCONF_LIGHTTPD_MOD_FASTCGI_PHP
+	@$(call install_alternative, lighttpd, 0, 0, 0644, \
+		/etc/lighttpd/conf.d/mod_fastcgi_php.conf)
 endif
 
 #	#
@@ -132,7 +142,7 @@ ifdef PTXCONF_LIGHTTPD_SYSTEMD_UNIT
 endif
 
 ifdef PTXCONF_LIGHTTPD_GENERIC_SITE
-ifdef PTXCONF_PHP5_SAPI_CGI
+ifdef PTXCONF_LIGHTTPD_MOD_FASTCGI_PHP
 	@$(call install_copy, lighttpd, 12, 102, 0644, \
 		$(PTXDIST_TOPDIR)/generic/var/www/lighttpd.html, \
 		/var/www/index.html)