mirror of https://github.com/hak5/openwrt-owl.git
update to new upstream release (v1.4.4), add expire and ssi modules, put some required modules in main package
SVN-Revision: 1971owl
Nicolas Thill
parent
572983ae73
commit
db2c85420f
|
|
@ -32,6 +32,12 @@ config BR2_PACKAGE_LIGHTTPD_MOD_CGI
|
|||
tristate
|
||||
default m if CONFIG_DEVEL
|
||||
|
||||
config BR2_PACKAGE_LIGHTTPD_MOD_EXPIRE
|
||||
depends BR2_PACKAGE_LIGHTTPD
|
||||
prompt "...-mod-expire - Expire module"
|
||||
tristate
|
||||
default m if CONFIG_DEVEL
|
||||
|
||||
config BR2_PACKAGE_LIGHTTPD_MOD_FASTCGI
|
||||
depends BR2_PACKAGE_LIGHTTPD
|
||||
prompt "...-mod-fastcgi - FastCGI module"
|
||||
|
|
@ -68,6 +74,12 @@ config BR2_PACKAGE_LIGHTTPD_MOD_SIMPLE_VHOST
|
|||
tristate
|
||||
default m if CONFIG_DEVEL
|
||||
|
||||
config BR2_PACKAGE_LIGHTTPD_MOD_SSI
|
||||
depends BR2_PACKAGE_LIGHTTPD
|
||||
prompt "...-mod-ssi - SSI module"
|
||||
tristate
|
||||
default m if CONFIG_DEVEL
|
||||
|
||||
config BR2_PACKAGE_LIGHTTPD_MOD_STATUS
|
||||
depends BR2_PACKAGE_LIGHTTPD
|
||||
prompt "...-mod-status - Server status display module"
|
||||
|
|
|
|||
|
|
@ -3,9 +3,9 @@
|
|||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=lighttpd
|
||||
PKG_VERSION:=1.4.2
|
||||
PKG_VERSION:=1.4.4
|
||||
PKG_RELEASE:=1
|
||||
PKG_MD5SUM:=c26eea734490129a45e465ac0f327e4a
|
||||
PKG_MD5SUM:=0142f34549cf326d1ee3631be665482f
|
||||
|
||||
PKG_SOURCE_URL:=http://www.lighttpd.net/download/
|
||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
||||
|
|
@ -19,8 +19,8 @@ include $(TOPDIR)/package/rules.mk
|
|||
define PKG_mod_template
|
||||
|
||||
$$(IPKG_$(1)):
|
||||
install -d -m0755 $$(IDIR_$(1))/usr/lib
|
||||
install -m0755 $(PKG_INSTALL_DIR)/usr/lib/mod_$(2).so $$(IDIR_$(1))/usr/lib/
|
||||
install -d -m0755 $$(IDIR_$(1))/usr/lib/lighttpd
|
||||
install -m0755 $(PKG_INSTALL_DIR)/usr/lib/lighttpd/mod_$(2).so $$(IDIR_$(1))/usr/lib/lighttpd/
|
||||
$(RSTRIP) $$(IDIR_$(1))
|
||||
$(IPKG_BUILD) $$(IDIR_$(1)) $(PACKAGE_DIR)
|
||||
|
||||
|
|
@ -30,24 +30,28 @@ $(eval $(call PKG_template,LIGHTTPD,lighttpd,$(PKG_VERSION)-$(PKG_RELEASE),$(ARC
|
|||
$(eval $(call PKG_template,LIGHTTPD_MOD_ALIAS,lighttpd-mod-alias,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
|
||||
$(eval $(call PKG_template,LIGHTTPD_MOD_AUTH,lighttpd-mod-auth,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
|
||||
$(eval $(call PKG_template,LIGHTTPD_MOD_CGI,lighttpd-mod-cgi,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
|
||||
$(eval $(call PKG_template,LIGHTTPD_MOD_EXPIRE,lighttpd-mod-expire,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
|
||||
$(eval $(call PKG_template,LIGHTTPD_MOD_FASTCGI,lighttpd-mod-fastcgi,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
|
||||
$(eval $(call PKG_template,LIGHTTPD_MOD_PROXY,lighttpd-mod-proxy,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
|
||||
$(eval $(call PKG_template,LIGHTTPD_MOD_REDIRECT,lighttpd-mod-redirect,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
|
||||
$(eval $(call PKG_template,LIGHTTPD_MOD_REWRITE,lighttpd-mod-rewrite,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
|
||||
$(eval $(call PKG_template,LIGHTTPD_MOD_SETENV,lighttpd-mod-setenv,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
|
||||
$(eval $(call PKG_template,LIGHTTPD_MOD_SIMPLE_VHOST,lighttpd-mod-simple-vhost,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
|
||||
$(eval $(call PKG_template,LIGHTTPD_MOD_SSI,lighttpd-mod-ssi,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
|
||||
$(eval $(call PKG_template,LIGHTTPD_MOD_STATUS,lighttpd-mod-status,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
|
||||
$(eval $(call PKG_template,LIGHTTPD_MOD_USERTRACK,lighttpd-mod-usertrack,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
|
||||
|
||||
$(eval $(call PKG_mod_template,LIGHTTPD_MOD_ALIAS,alias))
|
||||
$(eval $(call PKG_mod_template,LIGHTTPD_MOD_AUTH,auth))
|
||||
$(eval $(call PKG_mod_template,LIGHTTPD_MOD_CGI,cgi))
|
||||
$(eval $(call PKG_mod_template,LIGHTTPD_MOD_EXPIRE,expire))
|
||||
$(eval $(call PKG_mod_template,LIGHTTPD_MOD_FASTCGI,fastcgi))
|
||||
$(eval $(call PKG_mod_template,LIGHTTPD_MOD_PROXY,proxy))
|
||||
$(eval $(call PKG_mod_template,LIGHTTPD_MOD_REDIRECT,redirect))
|
||||
$(eval $(call PKG_mod_template,LIGHTTPD_MOD_REWRITE,rewrite))
|
||||
$(eval $(call PKG_mod_template,LIGHTTPD_MOD_SETENV,setenv))
|
||||
$(eval $(call PKG_mod_template,LIGHTTPD_MOD_SIMPLE_VHOST,simple_vhost))
|
||||
$(eval $(call PKG_mod_template,LIGHTTPD_MOD_SSI,ssi))
|
||||
$(eval $(call PKG_mod_template,LIGHTTPD_MOD_STATUS,status))
|
||||
$(eval $(call PKG_mod_template,LIGHTTPD_MOD_USERTRACK,usertrack))
|
||||
|
||||
|
|
@ -55,9 +59,10 @@ $(PKG_BUILD_DIR)/.configured:
|
|||
(cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \
|
||||
$(TARGET_CONFIGURE_OPTS) \
|
||||
CFLAGS="$(TARGET_CFLAGS)" \
|
||||
CPPFLAGS="-I$(STAGING_DIR)/usr/include" \
|
||||
LDFLAGS="-L$(STAGING_DIR)/usr/lib" \
|
||||
CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
|
||||
LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
|
||||
PCRE_LIB="-lpcre" \
|
||||
PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig" \
|
||||
./configure \
|
||||
--target=$(GNU_TARGET_NAME) \
|
||||
--host=$(GNU_TARGET_NAME) \
|
||||
|
|
@ -70,17 +75,29 @@ $(PKG_BUILD_DIR)/.configured:
|
|||
--datadir=/usr/share \
|
||||
--includedir=/usr/include \
|
||||
--infodir=/usr/share/info \
|
||||
--libdir=/usr/lib \
|
||||
--libdir=/usr/lib/lighttpd \
|
||||
--libexecdir=/usr/lib \
|
||||
--localstatedir=/var \
|
||||
--mandir=/usr/share/man \
|
||||
--sbindir=/usr/sbin \
|
||||
--sysconfdir=/etc \
|
||||
--sysconfdir=/etc/lighttpd \
|
||||
$(DISABLE_LARGEFILE) \
|
||||
$(DISABLE_NLS) \
|
||||
--enable-shared \
|
||||
--enable-static \
|
||||
--disable-rpath \
|
||||
--without-attr \
|
||||
--without-bzip2 \
|
||||
--without-fam \
|
||||
--without-gdbm \
|
||||
--without-ldap \
|
||||
--without-lua \
|
||||
--without-memcache \
|
||||
--without-mysql \
|
||||
--with-openssl="$(STAGING_DIR)/usr" \
|
||||
--with-pcre \
|
||||
--without-valgrind \
|
||||
--without-webdav-props \
|
||||
)
|
||||
touch $@
|
||||
|
||||
|
|
@ -99,6 +116,10 @@ $(IPKG_LIGHTTPD):
|
|||
install -m0644 ./files/lighttpd.default $(IDIR_LIGHTTPD)/etc/default/lighttpd
|
||||
install -m0755 -d $(IDIR_LIGHTTPD)/etc/init.d
|
||||
install -m0755 ./files/lighttpd.init $(IDIR_LIGHTTPD)/etc/init.d/lighttpd
|
||||
install -m0755 -d $(IDIR_LIGHTTPD)/usr/lib/lighttpd
|
||||
for m in dirlisting indexfile staticfile; do \
|
||||
cp -fpR $(PKG_INSTALL_DIR)/usr/lib/lighttpd/mod_$$m.so $(IDIR_LIGHTTPD)/usr/lib/lighttpd/ ; \
|
||||
done
|
||||
install -m0755 -d $(IDIR_LIGHTTPD)/usr/sbin
|
||||
cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/lighttpd $(IDIR_LIGHTTPD)/usr/sbin/
|
||||
$(RSTRIP) $(IDIR_LIGHTTPD)
|
||||
|
|
|
|||
|
|
@ -7,14 +7,17 @@
|
|||
#server.modules = (
|
||||
# "mod_rewrite",
|
||||
# "mod_redirect",
|
||||
# "mod_alias",
|
||||
# "mod_auth",
|
||||
# "mod_status",
|
||||
# "mod_setenv",
|
||||
# "mod_fastcgi",
|
||||
# "mod_proxy",
|
||||
# "mod_simple_vhost",
|
||||
# "mod_evhost",
|
||||
# "mod_cgi",
|
||||
# "mod_compress",
|
||||
# "mod_ssi",
|
||||
# "mod_usertrack"
|
||||
# "mod_usertrack",
|
||||
# "mod_expire"
|
||||
#)
|
||||
|
||||
## a static document-root, for virtual-hosting take look at the
|
||||
|
|
@ -24,11 +27,10 @@ server.document-root = "/www/"
|
|||
## where to send error-messages to
|
||||
#server.errorlog = "/var/log/lighttpd/error.log"
|
||||
|
||||
# files to check for if .../ is requested
|
||||
server.indexfiles = ( "index.html", "default.html",
|
||||
"index.htm", "default.htm" )
|
||||
## files to check for if .../ is requested
|
||||
index-file.names = ( "index.html", "default.html", "index.htm", "default.htm" )
|
||||
|
||||
# mimetype mapping
|
||||
## mimetype mapping
|
||||
mimetype.assign = (
|
||||
".pdf" => "application/pdf",
|
||||
".class" => "application/octet-stream",
|
||||
|
|
@ -48,9 +50,22 @@ mimetype.assign = (
|
|||
".xml" => "text/xml"
|
||||
)
|
||||
|
||||
# Use the "Content-Type" extended attribute to obtain mime type if possible
|
||||
## Use the "Content-Type" extended attribute to obtain mime type if possible
|
||||
#mimetypes.use-xattr = "enable"
|
||||
|
||||
## send a different Server: header
|
||||
## be nice and keep it at lighttpd
|
||||
#server.tag = "lighttpd"
|
||||
|
||||
$HTTP["url"] =~ "\.pdf$" {
|
||||
server.range-requests = "disable"
|
||||
}
|
||||
|
||||
##
|
||||
# which extensions should not be handle via static-file transfer
|
||||
#
|
||||
# .php, .pl, .fcgi are most often handled by mod_fastcgi or mod_cgi
|
||||
static-file.exclude-extensions = ( ".php", ".pl", ".fcgi" )
|
||||
|
||||
######### Options that are good to be but not neccesary to be changed #######
|
||||
|
||||
|
|
@ -58,12 +73,15 @@ mimetype.assign = (
|
|||
#server.port = 81
|
||||
|
||||
## bind to localhost (default: all interfaces)
|
||||
#server.bind = "grisu.home.kneschke.de"
|
||||
#server.bind = "localhost"
|
||||
|
||||
## error-handler for status 404
|
||||
#server.error-handler-404 = "/error-handler.html"
|
||||
#server.error-handler-404 = "/error-handler.php"
|
||||
|
||||
## to help the rc.scripts
|
||||
server.pid-file = "/var/run/lighttpd.pid"
|
||||
|
||||
|
||||
###### virtual hosts
|
||||
##
|
||||
|
|
@ -101,28 +119,34 @@ mimetype.assign = (
|
|||
## change uid to <uid> (default: don't care)
|
||||
#server.groupname = "nobody"
|
||||
|
||||
## to help the rc.script
|
||||
#server.pid-file = "/var/run/lighttpd.pid"
|
||||
|
||||
#### compress module
|
||||
#compress.cache-dir = "/dev/null/"
|
||||
#compress.filetype = ("text/plain", "text/html")
|
||||
|
||||
#### proxy module
|
||||
## read proxy.txt for more info
|
||||
#proxy.server = (
|
||||
# ".php" => (
|
||||
# "localhost" => (
|
||||
# "host" => "192.168.0.101",
|
||||
# "port" => 80
|
||||
# )
|
||||
# )
|
||||
#)
|
||||
|
||||
#### fastcgi module
|
||||
## read fastcgi.txt for more info
|
||||
#fastcgi.server = ( ".php" =>
|
||||
# ( "grisu" =>
|
||||
# (
|
||||
# "host" => "192.168.2.10",
|
||||
# "port" => 1026
|
||||
#fastcgi.server = (
|
||||
# ".php" => (
|
||||
# "localhost" => (
|
||||
# "socket" => "/tmp/php-fastcgi.socket",
|
||||
# "bin-path" => "/usr/local/bin/php"
|
||||
# )
|
||||
# )
|
||||
#)
|
||||
|
||||
#### CGI module
|
||||
#cgi.assign = ( ".pl" => "/usr/bin/perl",
|
||||
# ".cgi" => "/usr/bin/perl" )
|
||||
#
|
||||
#cgi.assign = ( ".pl" => "/usr/bin/perl", ".cgi" => "/usr/bin/perl" )
|
||||
|
||||
#### SSL engine
|
||||
#ssl.engine = "enable"
|
||||
|
|
@ -137,15 +161,13 @@ mimetype.assign = (
|
|||
#auth.backend = "plain"
|
||||
#auth.backend.plain.userfile = "lighttpd.user"
|
||||
#auth.backend.plain.groupfile = "lighttpd.group"
|
||||
|
||||
# auth.require = ( "/server-status" =>
|
||||
# (
|
||||
#auth.require = (
|
||||
# "/server-status" => (
|
||||
# "method" => "digest",
|
||||
# "realm" => "download archiv",
|
||||
# "require" => "group=www|user=jan|host=192.168.2.10"
|
||||
# ),
|
||||
# "/server-info" =>
|
||||
# (
|
||||
# "/server-info" => (
|
||||
# "method" => "digest",
|
||||
# "realm" => "download archiv",
|
||||
# "require" => "group=www|user=jan|host=192.168.2.10"
|
||||
|
|
@ -156,16 +178,10 @@ mimetype.assign = (
|
|||
#url.rewrite = ( "^/$" => "/server-status" )
|
||||
#url.redirect = ( "^/wishlist/(.+)" => "http://www.123.org/$1" )
|
||||
|
||||
#
|
||||
# define a pattern for the host url finding
|
||||
# %% => % sign
|
||||
# %0 => domain name + tld
|
||||
# %1 => tld
|
||||
# %2 => domain name without tld
|
||||
# %3 => subdomain 1 name
|
||||
# %4 => subdomain 2 name
|
||||
#
|
||||
# evhost.path-pattern = "/home/storage/dev/www/%3/htdocs/"
|
||||
#### both rewrite/redirect support back reference to regex conditional using %n
|
||||
#$HTTP["host"] =~ "^www\.(.*)" {
|
||||
# url.redirect = ( "^/(.*)" => "http://%1/$1" )
|
||||
#}
|
||||
|
||||
#### expire module
|
||||
#expire.url = ( "/buggy/" => "access 2 hours", "/asdhas/" => "access plus 1 seconds 2 minutes")
|
||||
|
|
@ -173,3 +189,29 @@ mimetype.assign = (
|
|||
#### ssi
|
||||
#ssi.extension = ( ".shtml" )
|
||||
|
||||
#### setenv
|
||||
#setenv.add-request-header = ( "TRAV_ENV" => "mysql://user@host/db" )
|
||||
#setenv.add-response-header = ( "X-Secret-Message" => "42" )
|
||||
|
||||
#### variable usage:
|
||||
## variable name without "." is auto prefixed by "var." and becomes "var.bar"
|
||||
#bar = 1
|
||||
#var.mystring = "foo"
|
||||
|
||||
## integer add
|
||||
#bar += 1
|
||||
## string concat, with integer cast as string, result: "www.foo1.com"
|
||||
#server.name = "www." + mystring + var.bar + ".com"
|
||||
## array merge
|
||||
#index-file.names = (foo + ".php") + index-file.names
|
||||
#index-file.names += (foo + ".php")
|
||||
|
||||
#### include
|
||||
#include /etc/lighttpd/lighttpd-inc.conf
|
||||
## same as above if you run: "lighttpd -f /etc/lighttpd/lighttpd.conf"
|
||||
#include "lighttpd-inc.conf"
|
||||
|
||||
#### include_shell
|
||||
#include_shell "echo var.a=1"
|
||||
## the above is same as:
|
||||
#var.a=1
|
||||
|
|
|
|||
|
|
@ -0,0 +1,9 @@
|
|||
Package: lighttpd-mod-expire
|
||||
Priority: optional
|
||||
Section: net
|
||||
Version: [TBDL]
|
||||
Architecture: [TBDL]
|
||||
Maintainer: Nico <nthill@free.fr>
|
||||
Source: http://openwrt.org/cgi-bin/viewcvs.cgi/openwrt/package/lighttpd/
|
||||
Description: Expire module for lighttpd
|
||||
Depends: lighttpd
|
||||
|
|
@ -0,0 +1,9 @@
|
|||
Package: lighttpd-mod-ssi
|
||||
Priority: optional
|
||||
Section: net
|
||||
Version: [TBDL]
|
||||
Architecture: [TBDL]
|
||||
Maintainer: Nico <nthill@free.fr>
|
||||
Source: http://openwrt.org/cgi-bin/viewcvs.cgi/openwrt/package/lighttpd/
|
||||
Description: SSI module for lighttpd
|
||||
Depends: lighttpd
|
||||
Loading…
Reference in New Issue