Author: glen Date: Fri Sep 15 16:14:28 2006 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- merged modular config from DEVEL
---- Files affected:
SOURCES:
lighttpd.conf (1.37 -> 1.38)
---- Diffs:
================================================================
Index: SOURCES/lighttpd.conf
diff -u SOURCES/lighttpd.conf:1.37 SOURCES/lighttpd.conf:1.38
--- SOURCES/lighttpd.conf:1.37 Wed Jul 12 10:06:53 2006
+++ SOURCES/lighttpd.conf Fri Sep 15 18:14:23 2006
@@ -1,44 +1,7 @@
-# lighttpd configuration file
-# use a it as base for lighttpd 1.4 and above
-#
# $Id$
+# lighttpd configuration file.
-############ Options you really have to take care of ####################
-
-## modules to load
-# at least mod_access and mod_accesslog should be loaded
-# all other module should only be loaded if really neccesary
-# - saves some time
-# - saves memory
-
-server.modules = (
-# "mod_rewrite",
-# "mod_redirect",
-# "mod_alias",
- "mod_access",
-# "mod_auth",
-# "mod_status",
-# "mod_simple_vhost",
-# "mod_evhost",
-# "mod_userdir",
-# "mod_secdownload",
-# "mod_fastcgi",
-# "mod_proxy",
-# "mod_cgi",
-# "mod_cml",
-# "mod_ssi",
-# "mod_evasive",
-# "mod_flv_streaming",
-# "mod_localizer",
-# "mod_setenv",
-# "mod_trigger_b4_dl",
-# "mod_compress",
-# "mod_deflate",
-# "mod_usertrack",
-# "mod_expire",
-# "mod_rrdtool",
- "mod_accesslog"
-)
+include_shell "/bin/cat conf.d/*.conf"
## a static document-root, for virtual-hosting take look at the
## server.virtual-* options
@@ -48,23 +11,15 @@
server.errorlog = "/var/log/lighttpd/error.log"
server.pid-file = "/var/run/lighttpd.pid"
-# files to check for if .../ is requested
-server.indexfiles = (
- "index.php",
- "index.html",
- "index.htm",
- "default.htm",
-)
+# mimetype mapping
+# include, relative to dirname of main config file
+include "mime.types.conf"
## set the event-handler (read the performance section in the manual)
# Linux 2.4+ rt-signals linux-rtsig
# Linux 2.6+ epoll linux-sysepoll
#server.event-handler = "linux-sysepoll"
-# mimetype mapping
-# include, relative to dirname of main config file
-include "mime.types.conf"
-
# Use the "Content-Type" extended attribute to obtain mime type if possible
#mimetype.use-xattr = "enable"
@@ -72,30 +27,14 @@
## be nice and keep it at lighttpd
#server.tag = "lighttpd"
-#### accesslog module
-accesslog.filename = "/var/log/lighttpd/access.log"
-
-## deny access the file-extensions
-#
-# ~ is for backupfiles from vi, emacs, joe, ...
-# .inc is often used for code includes which should in general not be part
-# of the document-root
-url.access-deny = ( "~", ".inc" )
-
$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 #######
## bind to port (default: 80)
-#server.port = 81
+server.port = 80
## bind to localhost (default: all interfaces)
#server.bind = "grisu.home.kneschke.de"
@@ -104,34 +43,17 @@
#server.error-handler-404 = "/error-handler.html"
#server.error-handler-404 = "/error-handler.php"
-###### 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/"
-
-
##
## Format: <errorfile-prefix><status-code>.html
## -> ..../status-404.html for 'File not found'
#server.errorfile-prefix = "/home/weigon/projects/lighttpd/doc/status-"
-
-## virtual directory listings
-#server.dir-listing = "enable"
-
+#
## enable debugging
#debug.log-request-header = "enable"
#debug.log-response-header = "enable"
#debug.log-request-handling = "enable"
#debug.log-file-not-found = "enable"
+#debug.log-condition-handling = "enable"
### only root can use these options
#
@@ -149,210 +71,5 @@
#connection.kbytes-per-second = 32
#server.kbytes-per-second = 128
-#### compress module
-#compress.cache-dir = "/tmp/lighttpd/cache/compress/"
-#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.debug = 1
-#fastcgi.server = (
-# ".php" => (
-# "localhost" => (
-# "socket" => "/var/run/php/php-fastcgi.sock",
-# "bin-path" => "/usr/bin/php.fcgi",
-# )
-# )
-#)
-
-#### standalone of php-fcgi
-# if you want to use standalone version of php.fcgi
-# install php-fcgi-init , start php-fcgi and then start lighttpd
-#
-#fastcgi.server = (
-# ".php" => (
-# ( "host" => "127.0.0.1",
-# "port" => 1026,
-# )
-# )
-#)
-
-
-
-#### CGI module
-#cgi.assign = (
-# ".pl" => "/usr/bin/perl",
-# ".cgi" => "/usr/bin/perl",
-#)
-
-#### SSL engine
-#ssl.engine = "enable"
-#ssl.pemfile = "server.pem"
-
-#### status module
-#status.status-url = "/server-status"
-#status.config-url = "/server-config"
-#status.statistics-url = "/server-stats"
-
-#### auth module
-## read authentication.txt for more info
-## debugging
-# 0 for off, 1 for 'auth-ok' messages, 2 for verbose debugging
-#auth.debug = 1
-## type of backend
-# plain, htpasswd, ldap or htdigest
-#auth.backend = "plain"
-# filename of the password storage
-## for plain
-#auth.backend.plain.userfile = "/etc/lighttpd/lighttpd.user"
-#auth.backend.plain.groupfile = "/etc/lighttpd/lighttpd.group"
-## for htpasswd
-#auth.backend.htpasswd.userfile = "/etc/lighttpd/lighttpd-htpasswd.user"
-## for htdigest
-#auth.backend.htdigest.userfile = "/etc/lighttpd/lighttpd-htdigest.user"
-## for ldap
-# the $ in auth.backend.ldap.filter is replaced by the
-# 'username' from the login dialog
-#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",
-# "realm" => "download archiv",
-# "require" => "user=jan"
-# ),
-# "/server-info" => (
-# "method" => "digest",
-# "realm" => "download archiv",
-# "require" => "valid-user"
-# )
-#)
-
-#### url handling modules (rewrite, redirect, access)
-#url.rewrite = (
-# "^/$" => "/server-status",
-#)
-#url.redirect = (
-# "^/wishlist/(.+)" => "http://www.123.org/$1";,
-#)
-#### both rewrite/redirect support back reference to regex conditional using %n
-#$HTTP["host"] =~ "^www\.(.*)" {
-# url.redirect = ( "^/(.*)" => "http://%1/$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",
-#)
-
-#### evasive module
-##
-## Limits number of connections per IP
-##
-#evasive.max-conns-per-ip = 5
-#evasive.http-status-code = 503
-#evasive.retry-after = 2
-
-#### deflate module
-##
-## Allows compress all output dynamic or static
-##
-#deflate.enabled = "enable"
-#deflate.compression-level = 9
-#deflate.mem-level = 9
-#deflate.window-size = 15
-#deflate.bzip2 = "enable"
-#deflate.min-compress-size = 200
-#deflate.sync-flush = "enable"
-#deflate.output-buffer-size = 8192
-#deflate.work-block-size = 512
-#deflate.mimetypes = ("text/html", "text/plain")
-#deflate.debug = "enable"
-
-#### ssi
-#ssi.extension = ( ".shtml" )
-
-#### rrdtool
-#rrdtool.binary = "/usr/bin/rrdtool"
-#rrdtool.db-name = "/var/www/lighttpd.rrd"
-
-#### setenv
-#setenv.add-request-header = ( "TRAV_ENV" => "mysql://[EMAIL PROTECTED]/db" )
-#setenv.add-response-header = ( "X-Secret-Message" => "42" )
-
-## 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
-
-## for mod_cml
-## don't forget to add index.cml to server.indexfiles
-# cml.extension = ".cml"
-# cml.memcache-hosts = ( "127.0.0.1:11211" )
-
-#### 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
-
-#### 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 = ""
-
-#### alias module
-#alias.url = (
-# "/cgi-bin/" => "/usr/lib/cgi-bin",
-#)
-
-#### flv_streaming module
-#flv-streaming.extensions = ( ".flv" )
-
+# webapps configs
include_shell "/bin/cat webapps.d/*.conf"
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/lighttpd.conf?r1=1.37&r2=1.38&f=u
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
