- update from debian

Changed files:
    lighttpd-mod_proxy.conf -> 1.3
    lighttpd-mod_simple_vhost.conf -> 1.3
    lighttpd-mod_ssi.conf -> 1.3
    lighttpd-mod_trigger_b4_dl.conf -> 1.3
    lighttpd-mod_userdir.conf -> 1.3

diff --git a/lighttpd-mod_proxy.conf b/lighttpd-mod_proxy.conf
index 52b11db4d48c074b3f5af6b2f6dd2d4f4ca6b13c..b18b4098c3bd8fc38a2fdb4fe5dc23f1c520da4b 100644 (file)
--- a/lighttpd-mod_proxy.conf
+++ b/lighttpd-mod_proxy.conf
@@ -1,15 +1,32 @@
+## Let lighttpd act as a proxy server for special file types, hosts etc
+##
+## Documentation: http://www.lighttpd.net/documentation/proxy.html
+
 server.modules += (
        "mod_proxy"
 )
 
-#### proxy module
-## read proxy.txt for more info
+## Balance algorithm, possible values are: "hash", "round-robin" or "fair" (default)
+# proxy.balance = "hash"
+
+## Redirect all queries to files ending with ".php" to 192.168.0.101:80
 #proxy.server = (
-#      ".php" => (
-#              "localhost" => (
-#                      "host" => "192.168.0.101",
-#                      "port" => 80,
-#              )
-#      )
+#      ".php" => ((
+#              "host" => "192.168.0.101",
+#              "port" => 80
+#      ))
 #)
 
+## Redirect all connections on www.example.com to 10.0.0.1{0,1,2,3}
+#$HTTP["host"] == "www.example.com" {
+#      proxy.balance = "hash"
+#      proxy.server = (
+#              "" => (
+#                      ( "host" => "10.0.0.10" ),
+#                      ( "host" => "10.0.0.11" ),
+#                      ( "host" => "10.0.0.12" ),
+#                      ( "host" => "10.0.0.13" ),
+#              ) 
+#      )
+#}
+#

diff --git a/lighttpd-mod_simple_vhost.conf b/lighttpd-mod_simple_vhost.conf
index 5bed03736d23e62f658dbbaccac6f037c1d59912..5be26ed6950805deeaf7d08cc0c71cdbb4748310 100644 (file)
--- a/lighttpd-mod_simple_vhost.conf
+++ b/lighttpd-mod_simple_vhost.conf
@@ -1,18 +1,16 @@
+# Simple name-based virtual hosting
+#
+# Documentation: http://www.lighttpd.net/documentation/simple-vhost.html
+
 server.modules += (
        "mod_simple_vhost"
 )
 
-###### virtual hosts
-##
-##   If you want name-based virtual hosting add the next three settings and load
-##   mod_simple_vhost
-##
-## document-root =
-##   virtual-server-root + virtual-server-default-host + virtual-server-docroot
-## or
-##   virtual-server-root + http-host + virtual-server-docroot
-##
-#simple-vhost.server-root         = "/home/weigon/wwwroot/servers/"
-#simple-vhost.default-host        = "grisu.home.kneschke.de"
-#simple-vhost.document-root       = "/pages/"
+## The document root of a virtual host isdocument-root =
+##   simple-vhost.server-root + $HTTP["host"] + simple-vhost.document-root
+simple-vhost.server-root         = "/home/services/lighttpd/"
+simple-vhost.document-root       = "/html/"
+
+## the default host if no host is sent
+simple-vhost.default-host        = "www.example.com"
 

diff --git a/lighttpd-mod_ssi.conf b/lighttpd-mod_ssi.conf
index 3bd1b0f992890c00d92f22599cf872cf28a83486..64237766da33acb90546f81319d7c5a0498ad52d 100644 (file)
--- a/lighttpd-mod_ssi.conf
+++ b/lighttpd-mod_ssi.conf
@@ -1,7 +1,11 @@
+# Server-Side Include implements simple preprocessing of
+# HTML files compatible to Apache SSI.
+#
+# Documentation: http://www.lighttpd.net/documentation/ssi.html
+
 server.modules += (
        "mod_ssi"
 )
 
-#### ssi
-#ssi.extension = ( ".shtml" )
-
+## The extension of the files which should be preprocessed (mostly .shtml)
+ssi.extension   = ( ".shtml" )

diff --git a/lighttpd-mod_trigger_b4_dl.conf b/lighttpd-mod_trigger_b4_dl.conf
index d5b952c4d843006fed678727d89a7ab0be8ecd23..f8a4c0321490124238bc147c50a25643cc80d37e 100644 (file)
--- a/lighttpd-mod_trigger_b4_dl.conf
+++ b/lighttpd-mod_trigger_b4_dl.conf
@@ -1,12 +1,24 @@
+# A module to prevent deep-linking from other sites.
+#
+# Documentation: http://www.lighttpd.net/documentation/trigger-b4-dl.txt
+
 server.modules += (
        "mod_trigger_b4_dl"
 )
 
-## for mod_trigger_b4_dl
-# trigger-before-download.gdbm-filename = "/home/weigon/testbase/trigger.db"
-# trigger-before-download.memcache-hosts = ( "127.0.0.1:11211" )
-# trigger-before-download.trigger-url = "^/trigger/"
-# trigger-before-download.download-url = "^/download/"
-# trigger-before-download.deny-url = "http://127.0.0.1/index.html"
-# trigger-before-download.trigger-timeout = 10
+## guarded download URL, direct access is denied
+#trigger-before-download.download-url = "^/download/"
+
+## trigger URL to allow downloads from <download-url>
+#trigger-before-download.trigger-url = "^/trigger/"
+
+## if access to a file is denied, the user is redirected to this URL
+#trigger-before-download.deny-url = "/home/services/lighttpd/html/deny.html"
+
+## access to granted for <timeout> seconds after the trigger
+#trigger-before-download.trigger-timeout = 10
 
+## storage of trigger information. If both destinations are provided,
+## the GDBM file takes precedence.
+#trigger-before-download.gdbm-filename = "/home/services/lighttpd/data/trigger.db"
+#trigger-before-download.memcache-hosts = ( "127.0.0.1:11211" )

diff --git a/lighttpd-mod_userdir.conf b/lighttpd-mod_userdir.conf
index 4fcd998fb14200a41ed1caf6969011b3d38e778f..1225c2eb948310aec84eb3ad9c4ba1d8f85aa106 100644 (file)
--- a/lighttpd-mod_userdir.conf
+++ b/lighttpd-mod_userdir.conf
@@ -1,10 +1,15 @@
+# The userdir module provides a simple way to link user-based directories into
+# the global namespace of the webserver.
+#
+# Documentation: http://www.lighttpd.net/documentation/userdir.html
+
 server.modules += (
        "mod_userdir"
 )
 
-#### userdir module
-#userdir.path = "public_html"
-#userdir.exclude-user = ( "root", "postmaster" )
-#
-## if set, only users from this list may use the feature
-#userdir.include-user = ""
+## the subdirectory of a user's home dir which should be accessible
+## under http://$host/~$user
+userdir.path         = "public_html"
+
+## The users whose home directories should not be accessible
+userdir.exclude-user = ( "root", "postmaster" )