Imported lighttpd.conf.

diff --git a/config/lighttpd/lighttpd.conf b/config/lighttpd/lighttpd.conf
new file mode 100644 (file)
index 0000000..611310e
--- /dev/null
+++ b/config/lighttpd/lighttpd.conf
@@ -0,0 +1,127 @@
+############################################################################
+#                                                                          #
+# This file is part of the IPFire Firewall.                                #
+#                                                                          #
+# IPFire is free software; you can redistribute it and/or modify           #
+# it under the terms of the GNU General Public License as published by     #
+# the Free Software Foundation; either version 2 of the License, or        #
+# (at your option) any later version.                                      #
+#                                                                          #
+# IPFire is distributed in the hope that it will be useful,                #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of           #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the            #
+# GNU General Public License for more details.                             #
+#                                                                          #
+# You should have received a copy of the GNU General Public License        #
+# along with IPFire; if not, write to the Free Software                    #
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA #
+#                                                                          #
+# Copyright (C) 2008 IPFire-Team <info@ipfire.org>.                        #
+#                                                                          #
+############################################################################
+
+server.document-root   = "/srv/www/ipfire/"
+
+server.port            = 444
+
+server.username                = "nobody"
+server.groupname       = "nobody"
+
+server.event-handler   = "linux-sysepoll"
+server.network-backend = "linux-sendfile"
+
+accesslog.filename     = "/var/log/lighttpd/access.log"
+server.errorlog                = "/var/log/lighttpd/error.log"
+static-file.exclude-extensions = ( ".php", ".pl", ".fcgi" )
+server.pid-file                = "/var/run/lighttpd.pid"
+#server.bind           = "127.0.0.1"
+
+#simple-vhost.server-root      = "/home/weigon/wwwroot/servers/"
+#simple-vhost.default-host     = "grisu.home.kneschke.de"
+#simple-vhost.document-root    = "/pages/"
+
+index-file.names = (
+               "index.html",
+               "index.htm",
+               "index.py",
+               "index.cgi"
+)
+
+compress.cache-dir     = "/var/cache/lighttpd/compress/"
+compress.filetype      = ("text/plain", "text/html")
+
+### SSL engine
+#ssl.engine            = "enable"
+#ssl.pemfile           = "/etc/ssl/private/server.pem"
+
+#auth.backend.ldap.hostnam     = "localhost"
+#auth.backend.ldap.base-dn     = "dc=my-domain,dc=com"
+#auth.backend.ldap.filter      = "(uid=$)"
+#auth.require = (
+#              "/server-status" =>
+#                      (
+#                              "method"  => "digest",
+#                              "realm"   => "download archiv",
+#                              "require" => "user=jan"
+#                      ),
+#              "/server-config" =>
+#                      (
+#                              "method"  => "digest",
+#                              "realm"   => "download archiv",
+#                              "require" => "valid-user"
+#                      )
+#)
+
+server.modules = (
+#              "mod_rewrite",
+#              "mod_redirect",
+#              "mod_alias",
+               "mod_access",
+#              "mod_cml",
+#              "mod_trigger_b4_dl",
+               "mod_auth",
+#              "mod_status",
+#              "mod_setenv",
+               "mod_fastcgi",
+#              "mod_proxy",
+               "mod_simple_vhost",
+#              "mod_evhost",
+#              "mod_userdir",
+               "mod_cgi",
+               "mod_compress",
+#              "mod_ssi",
+#              "mod_usertrack",
+#              "mod_expire",
+#              "mod_secdownload",
+#              "mod_rrdtool",
+               "mod_accesslog"
+)
+
+cgi.assign = (
+               ".py"   => "/usr/bin/python",
+               ".cgi"  => "/usr/bin/python",
+)
+
+mimetype.assign = (
+               ".gz"           =>      "application/x-gzip",
+               ".tar.gz"       =>      "application/x-tgz",
+               ".tgz"          =>      "application/x-tgz",
+               ".tar"          =>      "application/x-tar",
+               ".zip"          =>      "application/zip",
+               ".gif"          =>      "image/gif",
+               ".jpg"          =>      "image/jpeg",
+               ".jpeg"         =>      "image/jpeg",
+               ".png"          =>      "image/png",
+               ".css"          =>      "text/css",
+               ".html"         =>      "text/html",
+               ".htm"          =>      "text/html",
+               ".js"           =>      "text/javascript",
+               ".log"          =>      "text/plain",
+               ".conf"         =>      "text/plain",
+               ".text"         =>      "text/plain",
+               ".txt"          =>      "text/plain",
+               ".xml"          =>      "text/xml",
+               ".bz2"          =>      "application/x-bzip",
+               ".tbz"          =>      "application/x-bzip-compressed-tar",
+               ".tar.bz2"      =>      "application/x-bzip-compressed-tar"
+)

diff --git a/lfs/lighttpd b/lfs/lighttpd
index 5362a37e6cb693a4fd9e1c7ebb9c2a247bddf16d..109ff3998be68d364b25548a5297fc39fc61d1c8 100644 (file)
--- a/lfs/lighttpd
+++ b/lfs/lighttpd
@@ -25,10 +25,10 @@
 include Config
 
 PKG_NAME   = lighttpd
-VER        = 1.4.18
+VER        = 1.4.19
 
 THISAPP    = $(PKG_NAME)-$(VER)
-DL_FILE    = $(THISAPP).tar.bz2
+DL_FILE    = $(THISAPP).tar.gz
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 
 TARGET     = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
@@ -52,12 +52,15 @@ $(patsubst %,$(DIR_DL)/%,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
-       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
 
        cd $(DIR_APP) && ./configure --prefix=/usr --libdir=/usr/lib/$(PKG_NAME) \
                --disable-ipv6 --with-ldap --with-openssl=/usr/include
        cd $(DIR_APP) && make -j $(PARALLELISM)
        cd $(DIR_APP) && make install
+       
+       install -v m644 $(DIR_CONF)/$(PKG_NAME)/$(PKG_NAME).conf \
+               /etc/$(PKG_NAME).conf
 
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/src/rootfiles/core/lighttpd b/src/rootfiles/core/lighttpd
index 715bd4edfc366dde971f1eea4ec62e32d2d9a7c1..f7329da4a1a15034ba8144d43afdcde69dc8590d 100644 (file)
--- a/src/rootfiles/core/lighttpd
+++ b/src/rootfiles/core/lighttpd
@@ -1,4 +1,5 @@
-usr/bin/spawn-fcgi
+etc/lighttpd.conf
+#usr/bin/spawn-fcgi
 usr/lib/lighttpd
 #usr/lib/lighttpd/mod_access.la
 usr/lib/lighttpd/mod_access.so