From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from ptx.hi.pengutronix.de ([2001:6f8:1178:2:5054:ff:fec0:8e10] ident=Debian-exim) by metis.ext.pengutronix.de with esmtp (Exim 4.72) (envelope-from ) id 1XClXx-0006nc-QP for ptxdist@pengutronix.de; Thu, 31 Jul 2014 10:17:09 +0200 Received: from mol by ptx.hi.pengutronix.de with local (Exim 4.80) (envelope-from ) id 1XClXx-0005TW-Oi for ptxdist@pengutronix.de; Thu, 31 Jul 2014 10:17:09 +0200 Date: Thu, 31 Jul 2014 10:17:09 +0200 From: Michael Olbrich Message-ID: <20140731081709.GC29377@pengutronix.de> References: <1406743965-30235-1-git-send-email-u.kleine-koenig@pengutronix.de> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1406743965-30235-1-git-send-email-u.kleine-koenig@pengutronix.de> Subject: Re: [ptxdist] [PATCH] lighttpd: make more modules configurable Reply-To: ptxdist@pengutronix.de List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Sender: ptxdist-bounces@pengutronix.de Errors-To: ptxdist-bounces@pengutronix.de To: ptxdist@pengutronix.de On Wed, Jul 30, 2014 at 08:12:45PM +0200, Uwe Kleine-K=F6nig 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=F6nig > --- > 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 :=3D \ > # ----------------------------------------------------------------------= ------ > = > LIGHTTPD_MODULES-y :=3D > +LIGHTTPD_MODULES-$(PTXCONF_LIGHTTPD_MOD_ACCESS) +=3D mod_access > +LIGHTTPD_MODULES-$(PTXCONF_LIGHTTPD_MOD_ACCESSLOG) +=3D mod_accesslog > +LIGHTTPD_MODULES-$(PTXCONF_LIGHTTPD_MOD_ALIAS) +=3D mod_alias > +LIGHTTPD_MODULES-$(PTXCONF_LIGHTTPD_MOD_AUTH) +=3D mod_auth > LIGHTTPD_MODULES-$(PTXCONF_LIGHTTPD_MOD_CML) +=3D mod_cml > LIGHTTPD_MODULES-$(PTXCONF_LIGHTTPD_MOD_COMPRESS) +=3D mod_compress > LIGHTTPD_MODULES-$(PTXCONF_LIGHTTPD_MOD_FASTCGI) +=3D mod_fastcgi > LIGHTTPD_MODULES-$(PTXCONF_LIGHTTPD_MOD_MAGNET) +=3D mod_magnet > +LIGHTTPD_MODULES-$(PTXCONF_LIGHTTPD_MOD_REWRITE) +=3D mod_rewrite > LIGHTTPD_MODULES-$(PTXCONF_LIGHTTPD_MOD_TRIGGER_B4_DL) +=3D mod_trigger_= b4_dl > LIGHTTPD_MODULES-$(PTXCONF_LIGHTTPD_MOD_WEBDAV) +=3D mod_webdav > LIGHTTPD_MODULES-y +=3D $(call remove_quotes,$(PTXCONF_LIGHTTPD_MOD_EXTR= A)) > -- = > 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