diff --git a/rootfs/usr/local/bin/entrypoint-lighttpd.sh b/rootfs/usr/local/bin/entrypoint-lighttpd.sh index eaa2b13..5a037d7 100755 --- a/rootfs/usr/local/bin/entrypoint-lighttpd.sh +++ b/rootfs/usr/local/bin/entrypoint-lighttpd.sh @@ -124,6 +124,9 @@ fi # Create directories [ -d "/etc/ssl" ] || mkdir -p "$SSL_CONTAINER_DIR" # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +# Create symlinks +ln -sf "/tmp/lighttpd.err.log" "/dev/stderr" && chmod 666 "/tmp/lighttpd.err.log" +# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # Create files # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/rootfs/usr/local/share/template-files/config/lighttpd/lighttpd.conf b/rootfs/usr/local/share/template-files/config/lighttpd/lighttpd.conf index 8febfab..91497f7 100644 --- a/rootfs/usr/local/share/template-files/config/lighttpd/lighttpd.conf +++ b/rootfs/usr/local/share/template-files/config/lighttpd/lighttpd.conf @@ -1,188 +1,59 @@ ############################################################################### -# Default lighttpd.conf for Gentoo. # $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/files/conf/lighttpd.conf,v 1.3 2005/09/01 14:22:35 ka0ttic Exp $ ############################################################################### -# {{{ variables -var.basedir = "/data/htdocs/www" -var.logdir = "/dev/stdout" -var.statedir = "/var/lib/lighttpd" -# }}} +var.basedir = "/var/www/localhost" +var.statedir = "/var/lib/lighttpd" +var.logdir = "/tmp" + +server.username = "lighttpd" +server.groupname = "lighttpd" + +server.port = 80 +server.document-root = "/data/htdocs/www" +server.pid-file = "/tmp/lighttpd.pid" + +server.errorlog = "/tmp/lighttpd.err.log" + +server.tag = "lighttpd" +server.follow-symlink = "enable" +server.errorfile-prefix = var.basedir + "/error/status-" +server.indexfiles = ("index.php", "index.html","index.htm", "default.htm") -# {{{ modules -# At the very least, mod_access and mod_accesslog should be enabled. -# All other modules should only be loaded if necessary. -# NOTE: the order of modules is important. server.modules = ( -# "mod_rewrite", -# "mod_redirect", -# "mod_alias", + "mod_auth", + "mod_rewrite", + "mod_redirect", + "mod_alias", "mod_access", -# "mod_cml", -# "mod_trigger_b4_dl", -# "mod_auth", -# "mod_status", -# "mod_setenv", -# "mod_proxy", -# "mod_simple_vhost", -# "mod_evhost", -# "mod_userdir", -# "mod_deflate", -# "mod_ssi", -# "mod_usertrack", -# "mod_expire", -# "mod_secdownload", -# "mod_rrdtool", -# "mod_webdav", + "mod_fastcgi", + "mod_status", + "mod_setenv", + "mod_proxy", + "mod_simple_vhost", + "mod_evhost", + "mod_userdir", + "mod_deflate", + "mod_ssi", + "mod_usertrack", + "mod_expire", + "mod_secdownload", + "mod_rrdtool", + "mod_webdav", "mod_accesslog" ) -# }}} -# {{{ includes include "mime-types.conf" -# uncomment for cgi support -# include "mod_cgi.conf" -# uncomment for php/fastcgi support -# include "mod_fastcgi.conf" -# uncomment for php/fastcgi fpm support -# include "mod_fastcgi_fpm.conf" -# }}} +include "mod_cgi.conf" -# {{{ server settings -server.username = "lighttpd" -server.groupname = "lighttpd" - -server.document-root = var.basedir + "/htdocs" -server.pid-file = "/tmp/lighttpd.pid" - -server.errorlog = var.logdir + "/error.log" -# log errors to syslog instead -# server.errorlog-use-syslog = "enable" - -server.indexfiles = ("index.php", "index.html","index.htm", "default.htm") - -# server.tag = "lighttpd" - -server.follow-symlink = "enable" - -# event handler (defaults to "poll") -# see performance.txt -# -# for >= linux-2.4 -# server.event-handler = "linux-rtsig" -# for >= linux-2.6 -# server.event-handler = "linux-sysepoll" -# for FreeBSD -# server.event-handler = "freebsd-kqueue" - -# chroot to directory (defaults to no chroot) -# server.chroot = "/" - -# bind to port (defaults to 80) -# server.port = 81 - -# bind to name (defaults to all interfaces) -# server.bind = "grisu.home.kneschke.de" - -# error-handler for status 404 -# server.error-handler-404 = "/error-handler.html" -# server.error-handler-404 = "/error-handler.php" - -# Format: .html -# -> ..../status-404.html for 'File not found' -# server.errorfile-prefix = var.basedir + "/error/status-" - -# FAM support for caching stat() calls -# requires that lighttpd be built with USE=fam -# server.stat-cache-engine = "fam" -# }}} - -# {{{ mod_staticfile - -# which extensions should not be handled via static-file transfer -# (extensions that are usually handled by mod_cgi, mod_fastcgi, etc). static-file.exclude-extensions = (".php", ".pl", ".cgi", ".fcgi") -# }}} - -# {{{ mod_accesslog -accesslog.filename = var.logdir + "/tmp/access.log" -# }}} - -# {{{ mod_dirlisting -# enable directory listings -# dir-listing.activate = "enable" -# -# don't list hidden files/directories -# dir-listing.hide-dotfiles = "enable" -# -# use a different css for directory listings -# dir-listing.external-css = "/path/to/dir-listing.css" -# -# list of regular expressions. files that match any of the -# specified regular expressions will be excluded from directory -# listings. -# dir-listing.exclude = ("^\.", "~$") -# }}} - -# {{{ mod_access -# see access.txt +accesslog.filename = "/tmp/access.log" url.access-deny = ("~", ".inc") -# }}} +ssi.extension = (".shtml") +status.status-url = "/server-status" +status.config-url = "/server-config" -# {{{ mod_userdir -# see userdir.txt -# -# userdir.path = "public_html" -# userdir.exclude-user = ("root") -# }}} - -# {{{ mod_ssi -# see ssi.txt -# -# ssi.extension = (".shtml") -# }}} - -# {{{ mod_ssl -# see ssl.txt -# -# ssl.engine = "enable" -# ssl.pemfile = "server.pem" -# }}} - -# {{{ mod_status -# see status.txt -# -# status.status-url = "/server-status" -# status.config-url = "/server-config" -# }}} - -# {{{ mod_simple_vhost -# see simple-vhost.txt -# -# 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/" -# }}} - -# {{{ mod_deflate -# see compress.txt -# -# deflate.cache-dir = var.statedir + "/cache/compress" -# deflate.mimetypes = ("text/plain", "text/html") -# }}} - -# {{{ mod_proxy -# see proxy.txt -# proxy.server = ( ".php" => ( "localhost" => ( @@ -191,131 +62,5 @@ proxy.server = ( ".php" => ) ) ) -# }}} - -# {{{ mod_auth -# see authentication.txt -# -# 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", -# "realm" => "download archiv", -# "require" => "user=jan" -# ), -# "/server-info" => -# ( -# "method" => "digest", -# "realm" => "download archiv", -# "require" => "valid-user" -# ) -# ) -# }}} - -# {{{ mod_rewrite -# see rewrite.txt -# -# url.rewrite = ( -# "^/$" => "/server-status" -# ) -# }}} - -# {{{ mod_redirect -# see redirect.txt -# -# url.redirect = ( -# "^/wishlist/(.+)" => "http://www.123.org/$1" -# ) -# }}} - -# {{{ mod_evhost -# 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/" -# }}} - -# {{{ mod_expire -# expire.url = ( -# "/buggy/" => "access 2 hours", -# "/asdhas/" => "access plus 1 seconds 2 minutes" -# ) -# }}} - -# {{{ mod_rrdtool -# see rrdtool.txt -# -# rrdtool.binary = "/usr/bin/rrdtool" -# rrdtool.db-name = var.statedir + "/lighttpd.rrd" -# }}} - -# {{{ mod_setenv -# see setenv.txt -# -# setenv.add-request-header = ( "TRAV_ENV" => "mysql://user@host/db" ) -# setenv.add-response-header = ( "X-Secret-Message" => "42" ) -# }}} - -# {{{ mod_trigger_b4_dl -# see trigger_b4_dl.txt -# -# 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 -# }}} - -# {{{ mod_cml -# see cml.txt -# -# don't forget to add index.cml to server.indexfiles -# cml.extension = ".cml" -# cml.memcache-hosts = ( "127.0.0.1:11211" ) -# }}} - -# {{{ mod_webdav -# see webdav.txt -# -# $HTTP["url"] =~ "^/dav($|/)" { -# webdav.activate = "enable" -# webdav.is-readonly = "enable" -# } -# }}} - -# {{{ extra rules -# -# set Content-Encoding and reset Content-Type for browsers that -# support decompressing on-thy-fly (requires mod_setenv) -# $HTTP["url"] =~ "\.gz$" { -# setenv.add-response-header = ("Content-Encoding" => "x-gzip") -# mimetype.assign = (".gz" => "text/plain") -# } - -# $HTTP["url"] =~ "\.bz2$" { -# } -# -# }}} - -# {{{ debug -# debug.log-request-header = "enable" -# debug.log-response-header = "enable" -# debug.log-request-handling = "enable" -# debug.log-file-not-found = "enable" -# }}} # vim: set ft=conf foldmethod=marker et : -