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

[Michael Olbrich <m.olbrich@pengutronix.de>]

On Wed, Jul 30, 2014 at 08:12:45PM +0200, Uwe Kleine-König wrote:
> This comes handy if a package installs config sniplets to
> /etc/lighttpd/conf.d that require the respective modules.

So the options can be selected, right.

"mod_access mod_accesslog mod_auth" are the default in LIGHTTPD_MOD_EXTRA.
They need to be removed there and should default to 'y'.

Michael

> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
> ---
>  rules/lighttpd.in   | 30 ++++++++++++++++++++++++++++++
>  rules/lighttpd.make |  5 +++++
>  2 files changed, 35 insertions(+)
> 
> diff --git a/rules/lighttpd.in b/rules/lighttpd.in
> index 5e132f286ddb..7242532fafca 100644
> --- a/rules/lighttpd.in
> +++ b/rules/lighttpd.in
> @@ -83,6 +83,30 @@ endmenu
>  
>  menu "modules                     "
>  
> +config LIGHTTPD_MOD_ACCESS
> +	bool
> +	prompt "mod_access"
> +	help
> +	  Deny access to some files.
> +
> +config LIGHTTPD_MOD_ACCESSLOG
> +	bool
> +	prompt "mod_accesslog"
> +	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"
> +	help
> +	  User authentication
> +
>  config LIGHTTPD_MOD_CML
>  	bool
>  	select LIGHTTPD_LUA
> @@ -136,6 +160,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
> 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

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

-- 
ptxdist mailing list
ptxdist@pengutronix.de