1: Upgrade to 1.2.5

2: sync lighttpd.conf.sample to current version
3: make rc files workable.

Approved by:	maintainer

4 files changed, 70 insertions, 15 deletions

diff --git a/www/lighttpd/Makefile b/www/lighttpd/Makefile
index f68bf2e73ed5..51d8c5370879 100644
--- a/www/lighttpd/Makefile
+++ b/www/lighttpd/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	lighttpd
-PORTVERSION=	1.2.4
+PORTVERSION=	1.2.5
 CATEGORIES=	www
 MASTER_SITES=	http://jan.kneschke.de/projects/lighttpd/download/
 
diff --git a/www/lighttpd/distinfo b/www/lighttpd/distinfo
index 52bc4658d023..e26cf8953287 100644
--- a/www/lighttpd/distinfo
+++ b/www/lighttpd/distinfo
@@ -1,2 +1,2 @@
-MD5 (lighttpd-1.2.4.tar.gz) = 60bc80f20e0f319c5387d56e98ffe1e8
-SIZE (lighttpd-1.2.4.tar.gz) = 580444
+MD5 (lighttpd-1.2.5.tar.gz) = 0d779d25f62a05a75d0535a1202e9280
+SIZE (lighttpd-1.2.5.tar.gz) = 587819
diff --git a/www/lighttpd/files/lighttpd.conf.sample b/www/lighttpd/files/lighttpd.conf.sample
index f57893d0e3fd..e821f9278618 100644
--- a/www/lighttpd/files/lighttpd.conf.sample
+++ b/www/lighttpd/files/lighttpd.conf.sample
@@ -2,7 +2,7 @@
 # 
 # use a it as base for lighttpd 1.0.0 and above
 #
-# $Id: lighttpd.conf,v 1.3 2004/02/07 21:15:05 weigon Exp $
+# $Id: lighttpd.conf,v 1.5 2004/08/01 07:01:29 weigon Exp $
 
 ############ Options you really have to take care of ####################
 
@@ -13,6 +13,7 @@
 # - saves memory
 server.modules              = ( 
 #                               "mod_rewrite", 
+#                               "mod_redirect", 
 			        "mod_access", 
 #				"mod_auth", 
 #                               "mod_status", 
@@ -21,14 +22,16 @@ server.modules              = (
 #				"mod_evhost",
 #				"mod_cgi",
 #				"mod_compress",
+#                               "mod_ssi",
+#                               "mod_usertrack",
 				"mod_accesslog" )
 
 ## a static document-root, for virtual-hosting take look at the 
 ## server.virtual-* options
-server.document-root             = "/var/www/"
+server.document-root             = "/usr/local/www/data/"
 
 ## where to send error-messages to
-server.errorlog            = "/var/log/lighttpd/error.log"
+server.errorlog            = "/var/log/lighttpd.error.log"
 
 # files to check for if .../ is requested
 server.indexfiles          = ( "index.php", "index.html", 
@@ -49,10 +52,38 @@ mimetype.assign            = ( ".png"  => "image/png",
                                 ".tgz"  => "application/x-tgz",
                                 ".gz"   => "application/x-gzip",
 				".c"    => "text/plain",
-				".conf" => "text/plain" )
+				".conf" => "text/plain",
+			        ".css"  => "text/css",
+                                ".js"   => "text/javascript",
+				".asc" =>       "text/plain",
+				".dvi" =>       "application/x-dvi" ,
+				".ps" =>        "application/postscript" ,
+				".gif" =>       "image/gif" ,
+				".mpeg" =>      "video/mpeg" ,
+				".mpg" =>       "video/mpeg" ,
+				".avi" =>       "video/x-msvideo" ,
+				".mov" =>       "video/quicktime" ,
+				".qt"  =>       "video/quicktime" ,
+				".mp3" =>       "audio/mpeg" ,
+				".ogg" =>       "audio/x-wav" ,
+				".wav" =>       "audio/x-wav" ,
+				".pac" =>       "application/x-ns-proxy-autoconfig" ,
+				".sig" =>       "application/pgp-signature" ,
+				".torrent"  =>  "application/x-bittorrent" ,
+				".class" =>     "application/octet-stream" ,
+				".tar" =>       "application/x-tar" ,
+				".zip" =>       "application/zip" ,
+				".dtd" =>       "text/xml" ,
+				".xml" =>       "text/xml" ,
+				".xbm" =>       "image/x-xbitmap" ,
+				".xpm" =>       "image/x-xpixmap" ,
+				".xwd" =>       "image/x-xwindowdump" ,
+				".text" =>      "text/plain" ,
+				".m3u"  =>      "audio/x-mpegurl"
+ )
 
 #### accesslog module
-accesslog.filename          = "/var/log/lighttpd/access.log"
+accesslog.filename          = "/var/log/lighttpd.access.log"
 
 ## deny access the file-extensions
 #
@@ -100,20 +131,21 @@ url.access-deny             = ( "~", ".inc" )
 ### only root can use these options
 #
 # chroot() to directory (default: no chroot() )
-#server.chroot             = "/"
+#server.chroot            = "/"
 
 ## change uid to <uid> (default: don't care)
-server.username            = "www-data"
+server.username            = "www"
 
 ## change uid to <uid> (default: don't care)
-server.groupname           = "www-data"
+server.groupname           = "www"
 
-server.pid-file		   = "/var/run/lighttpd.pid" 
+server.pid-file		   = "/var/run/lighttpd.pid"
 #### compress module
-#compress.cache-dir          = "/var/tmp/lighttpd/cache/compress/"
+#compress.cache-dir          = "/tmp/lighttpd/cache/compress/"
 #compress.filetype           = ("text/plain", "text/html")
 
 #### fastcgi module
+## read fastcgi.txt for more info
 #fastcgi.server              = ( ".php" =>
 #				( "grisu" => 
 #				  ( 
@@ -137,10 +169,15 @@ server.pid-file		   = "/var/run/lighttpd.pid"
 #status.rrd-dir              = "/home/weigon/wwwroot/logs/"
 
 #### auth module
+## read authentification.txt for more info
 #auth.backend                = "plain"
 #auth.backend.plain.userfile = "lighttpd.user"
 #auth.backend.plain.groupfile = "lighttpd.group"
 
+#auth.backend.ldap.hostname = "localhost"
+#auth.backend.ldap.base-dn  = "dc=my-domain,dc=com"
+#auth.backend.ldap.filter   = "(uid=$)"
+
 #auth.require                = ( "/server-status" => 
 #                                ( 
 #				  "method"  => "digest",
@@ -159,3 +196,19 @@ server.pid-file		   = "/var/run/lighttpd.pid"
 #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/"
+
+#### expire module
+#expire.url                  = ( "/buggy/" => "access 2 hours", "/asdhas/" => "access plus 1 seconds 2 minutes")
+
+#### ssi
+# ssi.extension              = ( ".shtml" )
diff --git a/www/lighttpd/files/lighttpd.sh.tmpl b/www/lighttpd/files/lighttpd.sh.tmpl
index 6fe7a01d66f7..18bedcba9bf1 100644
--- a/www/lighttpd/files/lighttpd.sh.tmpl
+++ b/www/lighttpd/files/lighttpd.sh.tmpl
@@ -23,7 +23,7 @@ rcvar=`set_rcvar`
 
 command=%%PREFIX%%/sbin/lighttpd
 pidfile=/var/run/lighttpd.pid
-required_files=%%PREFIX%%/etc/lighttpd.conf
+required_files=${lighttpd_conf}
 
 stop_postcmd=stop_postcmd
 
@@ -35,7 +35,9 @@ stop_postcmd()
 # set defaults
 
 lighttpd_enable=${lighttpd_enable:-"NO"}
-lighttpd_flags=${lighttpd_flags:-""}
+lighttpd_conf=${lighttpd_conf:-"%%PREFIX%%/etc/lighttpd.conf"}
+
+command_args="-f ${lighttpd_conf}"
 
 load_rc_config $name
 run_rc_command "$1"