diff options
author | Aaron Walker <ka0ttic@gentoo.org> | 2005-08-22 16:01:18 +0000 |
---|---|---|
committer | Aaron Walker <ka0ttic@gentoo.org> | 2005-08-22 16:01:18 +0000 |
commit | 4363ca28a31b2f4628ffa9c697306ab4aab43a2e (patch) | |
tree | ac011d1ae3f51a4fad4a9fa0a08aa80047bee0ef /www-servers/lighttpd | |
parent | Added lua/webdav for www-servers/lighttpd. (diff) | |
download | historical-4363ca28a31b2f4628ffa9c697306ab4aab43a2e.tar.gz historical-4363ca28a31b2f4628ffa9c697306ab4aab43a2e.tar.bz2 historical-4363ca28a31b2f4628ffa9c697306ab4aab43a2e.zip |
Version bump; many ebuild changes this release. Added support for USE flags: doc,fam,gdbm,lua,webdav; Added logrotate script/rewrote init.d script. Also, new custom gentoo configuration now located in /etc/lighttpd. Tidy old ebuilds/patches.
Package-Manager: portage-1.589-cvs
Diffstat (limited to 'www-servers/lighttpd')
20 files changed, 708 insertions, 459 deletions
diff --git a/www-servers/lighttpd/ChangeLog b/www-servers/lighttpd/ChangeLog index 5e9f207ac9eb..1f38dafc7636 100644 --- a/www-servers/lighttpd/ChangeLog +++ b/www-servers/lighttpd/ChangeLog @@ -1,6 +1,21 @@ # ChangeLog for www-servers/lighttpd # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/ChangeLog,v 1.34 2005/08/20 14:30:54 ka0ttic Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/ChangeLog,v 1.35 2005/08/22 16:01:18 ka0ttic Exp $ + +*lighttpd-1.4.1 (22 Aug 2005) + + 22 Aug 2005; Aaron Walker <ka0ttic@gentoo.org> + -files/lighttpd-1.3.10-gentoo.diff, -files/lighttpd-1.3.10-php.diff, + -files/lighttpd-1.3.10-upstream.diff, + -files/lighttpd-1.4.0-stat-cache.diff, +files/conf/lighttpd.conf, + +files/conf/mime-types.conf, +files/conf/mod_fastcgi.conf, + +files/lighttpd.initd, +files/lighttpd.logrotate, metadata.xml, + -lighttpd-1.3.10-r1.ebuild, -lighttpd-1.3.15.ebuild, + -lighttpd-1.4.0.ebuild, +lighttpd-1.4.1.ebuild: + Version bump; many ebuild changes this release. Added support for USE flags: + doc,fam,gdbm,lua,webdav; Added logrotate script/rewrote init.d script. Also, + new custom gentoo configuration now located in /etc/lighttpd. Tidy old + ebuilds/patches. 20 Aug 2005; Aaron Walker <ka0ttic@gentoo.org> lighttpd-1.3.10-r1.ebuild, lighttpd-1.3.13-r3.ebuild, lighttpd-1.3.15.ebuild, lighttpd-1.3.16.ebuild, diff --git a/www-servers/lighttpd/Manifest b/www-servers/lighttpd/Manifest index 65548cdecf0b..97bc89428ad8 100644 --- a/www-servers/lighttpd/Manifest +++ b/www-servers/lighttpd/Manifest @@ -1,36 +1,33 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 ecf5175bfe5c93d7dd2057d34b598d91 lighttpd-1.3.15.ebuild 2637 -MD5 87c024aa65dceef245da55e8c2391395 lighttpd-1.4.0.ebuild 2175 -MD5 70edfdae2d059d97e2502264c9d46a6f lighttpd-1.3.10-r1.ebuild 2185 MD5 81af13d45943a9638f0d7de071256bf8 lighttpd-1.3.16.ebuild 2549 MD5 49ded22216ffc6092d1a1e04a6e420c1 lighttpd-1.3.13-r3.ebuild 2607 -MD5 3d2f7576cc3690b965e5cd4c8c30eab7 ChangeLog 9758 -MD5 4a186842848d9c384e2d12785ba426bc metadata.xml 165 +MD5 67d5f19b3fc3fb8079ad39868c0a95a6 lighttpd-1.4.1.ebuild 4862 +MD5 8b5d92b4aed3c62cb7270e292eafc356 ChangeLog 10500 +MD5 6a9d4814404d8d51327e5b8306ee3d7e metadata.xml 726 MD5 1d925aed297ec4541fb230dd19e11bc1 files/spawn-fcgi.confd 1076 MD5 f984dc26b2bc491272d302ab453f6e6b files/lighttpd-1.3.13-ldap-binddn.diff 3863 MD5 e605a4ead0ce7b1e0788c0b0b1161871 files/spawn-fcgi.initd 1383 MD5 9cc5ffbffdd7554797c338c5972ed813 files/lighttpd-1.3.13-valid-user.diff 762 MD5 8648177a5f9a79cd4ba0eaaa4e769fdc files/lighttpd-1.3.11-gentoo.diff 1784 MD5 7fdb430fc7240e6e6a9078e4e57f6322 files/lighttpd-1.3.10.initd 666 -MD5 d0e3dbe62af1ef54922055287f40c59d files/lighttpd-1.4.0-stat-cache.diff 341 MD5 f111e60bb593bffbdb01b9aece46ab20 files/lighttpd-1.3.13-php.diff 1399 -MD5 39a52ad2d8f21296e767ee2663243716 files/digest-lighttpd-1.3.10-r1 67 MD5 77ba3937d1e8762f8d8b6b2ea9ee1aaa files/digest-lighttpd-1.3.13-r3 67 -MD5 2299a6229d7b298b7b0f66d611c041d9 files/digest-lighttpd-1.3.15 67 MD5 c54a6d92e91493bbb27e8f346f6ac342 files/digest-lighttpd-1.3.16 67 -MD5 1b01aa98985e773539dc8b6dc0be977f files/lighttpd-1.3.10-upstream.diff 1974 -MD5 4bb3bdffa967a53d266668b1040f2678 files/lighttpd-1.3.10-php.diff 971 MD5 5eb378dcd8905a09175df3e48953100c files/lighttpd-1.3.13-zope-deserves-lovins-too.diff 5970 -MD5 4e52f3344c9c7e3bad9f7e79bb447d74 files/digest-lighttpd-1.4.0 66 +MD5 cd47f8973299bf15bed4677b430ffcc5 files/lighttpd.initd 1009 +MD5 505de9ff2c21c63f75afbc4b79deaa81 files/digest-lighttpd-1.4.1 66 MD5 0c57eeef1963af5add8b9608e0bc0d0f files/lighttpd-1.3.13-no-mysql-means-no-mysql.diff 1456 -MD5 faeefb6d35a7cd7b4a2b4b78d63622f7 files/lighttpd-1.3.10-gentoo.diff 1777 MD5 44374d14af9b69b8f60f8d73f14c848d files/lighttpd-1.3.13-pam-name.diff 564 +MD5 210f81ad7867965b19993d0a4d8d54e7 files/lighttpd.logrotate 488 +MD5 2473934daf9c34575a40c287a3d6f597 files/conf/lighttpd.conf 8243 +MD5 20f159c94154005138a3c709fd476beb files/conf/mod_fastcgi.conf 566 +MD5 cac2b9328b62830cb4601f83695b541e files/conf/mime-types.conf 2965 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2 (GNU/Linux) -iD8DBQFDBz+REZCkKN40op4RAiuFAJ97O5qOp++vltTUcGTyZS4Ldfz/IwCgn2in -SN4uZaQRhZq3g90Krb5CNyo= -=sqT5 +iD8DBQFDCfboEZCkKN40op4RAsz1AKCbl5RvOCQLZUpHzAkUlYmtFewN4wCeIO6R +y6q8BGp9Sx0Lj9QGP6ZqKo4= +=3VIE -----END PGP SIGNATURE----- diff --git a/www-servers/lighttpd/files/conf/lighttpd.conf b/www-servers/lighttpd/files/conf/lighttpd.conf new file mode 100644 index 000000000000..576e870228ad --- /dev/null +++ b/www-servers/lighttpd/files/conf/lighttpd.conf @@ -0,0 +1,330 @@ +############################################################################### +# Default lighttpd.conf for Gentoo. +# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/files/conf/lighttpd.conf,v 1.1 2005/08/22 16:01:18 ka0ttic Exp $ +############################################################################### + +include "mime-types.conf" +# uncomment for php/fastcgi support +# include "mod_fastcgi.conf" + +# {{{ modules +# At the very least, mod_access and mod_accesslog should be enabled. +# All other modules should only be loaded if necessary. +server.modules = ( +# "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_cgi", +# "mod_compress", +# "mod_ssi", +# "mod_usertrack", +# "mod_expire", +# "mod_secdownload", +# "mod_rrdtool", +# "mod_webdav", + "mod_accesslog" ) +# }}} + +# {{{ server settings +server.username = "lighttpd" +server.groupname = "lighttpd" + +server.document-root = "/var/www/localhost/htdocs" +server.errorlog = "/var/log/lighttpd/error.log" +server.pid-file = "/var/run/lighttpd.pid" + +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: <errorfile-prefix><status-code>.html +# -> ..../status-404.html for 'File not found' +# server.errorfile-prefix = "/home/weigon/projects/lighttpd/doc/status-" + +# FAM support for caching stat() calls +# requires that lighttpd be built with USE=fam +# server.stat-cache-engine = "fam" + +# }}} + +# {{{ misc + +# 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/log/lighttpd/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 + +url.access-deny = ("~", ".inc") +# }}} + +# {{{ mod_alias +# see alias.txt +# +# alias.url = ( +# "/cgi-bin/" => "/var/www/localhost/cgi-bin/" +# ) +# }}} + +# {{{ mod_userdir +# see userdir.txt +# +# userdir.path = "public_html" +# userdir.exclude-user = ("root") +# }}} + +# {{{ mod_cgi +# see cgi.txt +# +# cgi.assign = ( +# ".pl" => "/usr/bin/perl", +# ".cgi" => "/usr/bin/perl" +# ) +# }}} + +# {{{ 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_compress +# see compress.txt +# +# compress.cache-dir = "/var/lib/lighttpd/cache/compress" +# compress.filetype = ("text/plain", "text/html") +# }}} + +# {{{ mod_proxy +# see proxy.txt +# +# proxy.server = ( ".php" => +# ( "localhost" => +# ( +# "host" => "192.168.0.101", +# "port" => 80 +# ) +# ) +# ) +# }}} + +# {{{ 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/www/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 +# +# disable directory listings for /cgi-bin +# $HTTP["url"] =~ "/cgi-bin/" { +# dir-listing.activate = "disable" +# } + +# 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$" { +# setenv.add-response-header = ("Content-Encoding" => "x-bzip2") +# mimetype.assign = (".bz2" => "text/plain") +# } +# +# }}} + +# {{{ 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 : diff --git a/www-servers/lighttpd/files/conf/mime-types.conf b/www-servers/lighttpd/files/conf/mime-types.conf new file mode 100644 index 000000000000..c25670501f99 --- /dev/null +++ b/www-servers/lighttpd/files/conf/mime-types.conf @@ -0,0 +1,68 @@ +############################################################################### +# Default mime-types.conf for Gentoo. +# include'd from lighttpd.conf. +# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/files/conf/mime-types.conf,v 1.1 2005/08/22 16:01:18 ka0ttic Exp $ +############################################################################### + +# {{{ mime types +mimetype.assign = ( + ".pdf" => "application/pdf", + ".sig" => "application/pgp-signature", + ".spl" => "application/futuresplash", + ".class" => "application/octet-stream", + ".ps" => "application/postscript", + ".torrent" => "application/x-bittorrent", + ".dvi" => "application/x-dvi", + ".gz" => "application/x-gzip", + ".pac" => "application/x-ns-proxy-autoconfig", + ".swf" => "application/x-shockwave-flash", + ".tar.gz" => "application/x-tgz", + ".tgz" => "application/x-tgz", + ".tar" => "application/x-tar", + ".zip" => "application/zip", + ".mp3" => "audio/mpeg", + ".m3u" => "audio/x-mpegurl", + ".wma" => "audio/x-ms-wma", + ".wax" => "audio/x-ms-wax", + ".ogg" => "application/ogg", + ".wav" => "audio/x-wav", + ".gif" => "image/gif", + ".jpg" => "image/jpeg", + ".jpeg" => "image/jpeg", + ".png" => "image/png", + ".xbm" => "image/x-xbitmap", + ".xpm" => "image/x-xpixmap", + ".xwd" => "image/x-xwindowdump", + ".css" => "text/css", + ".html" => "text/html", + ".htm" => "text/html", + ".js" => "text/javascript", + ".asc" => "text/plain", + ".c" => "text/plain", + ".h" => "text/plain", + ".cc" => "text/plain", + ".cpp" => "text/plain", + ".hh" => "text/plain", + ".hpp" => "text/plain", + ".conf" => "text/plain", + ".text" => "text/plain", + ".txt" => "text/plain", + ".diff" => "text/plain", + ".patch" => "text/plain", + ".dtd" => "text/xml", + ".xml" => "text/xml", + ".mpeg" => "video/mpeg", + ".mpg" => "video/mpeg", + ".mov" => "video/quicktime", + ".qt" => "video/quicktime", + ".avi" => "video/x-msvideo", + ".asf" => "video/x-ms-asf", + ".asx" => "video/x-ms-asf", + ".wmv" => "video/x-ms-wmv", + ".bz2" => "application/x-bzip", + ".tbz" => "application/x-bzip-compressed-tar", + ".tar.bz2" => "application/x-bzip-compressed-tar" + ) +# }}} + +# vim: set ft=conf foldmethod=marker et : diff --git a/www-servers/lighttpd/files/conf/mod_fastcgi.conf b/www-servers/lighttpd/files/conf/mod_fastcgi.conf new file mode 100644 index 000000000000..0da57b518440 --- /dev/null +++ b/www-servers/lighttpd/files/conf/mod_fastcgi.conf @@ -0,0 +1,19 @@ +############################################################################### +# mod_fastcgi.conf +# include'd by lighttpd.conf. +# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/files/conf/mod_fastcgi.conf,v 1.1 2005/08/22 16:01:18 ka0ttic Exp $ +############################################################################### + +server.modules += ("mod_fastcgi") +fastcgi.server = + ( ".php" => + ( "localhost" => + ( + "host" => "127.0.0.1", + "port" => 1026, + "bin-path" => "/usr/bin/php-cgi" + ) + ) + ) + +# vim: set ft=conf foldmethod=marker et : diff --git a/www-servers/lighttpd/files/digest-lighttpd-1.3.10-r1 b/www-servers/lighttpd/files/digest-lighttpd-1.3.10-r1 deleted file mode 100644 index 2084989a4e2c..000000000000 --- a/www-servers/lighttpd/files/digest-lighttpd-1.3.10-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 28623eff50653a9b104ddb20fe65aaf1 lighttpd-1.3.10.tar.gz 667324 diff --git a/www-servers/lighttpd/files/digest-lighttpd-1.3.15 b/www-servers/lighttpd/files/digest-lighttpd-1.3.15 deleted file mode 100644 index ca59f54ede2d..000000000000 --- a/www-servers/lighttpd/files/digest-lighttpd-1.3.15 +++ /dev/null @@ -1 +0,0 @@ -MD5 e605ade1071f25dec9001730ec753112 lighttpd-1.3.15.tar.gz 702088 diff --git a/www-servers/lighttpd/files/digest-lighttpd-1.4.0 b/www-servers/lighttpd/files/digest-lighttpd-1.4.0 deleted file mode 100644 index 3f02c149e4a4..000000000000 --- a/www-servers/lighttpd/files/digest-lighttpd-1.4.0 +++ /dev/null @@ -1 +0,0 @@ -MD5 926a3603615c9edf5859977f1b8b6033 lighttpd-1.4.0.tar.gz 749159 diff --git a/www-servers/lighttpd/files/digest-lighttpd-1.4.1 b/www-servers/lighttpd/files/digest-lighttpd-1.4.1 new file mode 100644 index 000000000000..954f48b6c0b4 --- /dev/null +++ b/www-servers/lighttpd/files/digest-lighttpd-1.4.1 @@ -0,0 +1 @@ +MD5 3abffbe574fd835721760a37c00d3714 lighttpd-1.4.1.tar.gz 759063 diff --git a/www-servers/lighttpd/files/lighttpd-1.3.10-gentoo.diff b/www-servers/lighttpd/files/lighttpd-1.3.10-gentoo.diff deleted file mode 100644 index 9a77e7ef60b8..000000000000 --- a/www-servers/lighttpd/files/lighttpd-1.3.10-gentoo.diff +++ /dev/null @@ -1,50 +0,0 @@ -diff --exclude='*~' -urN lighttpd-1.3.10.orig/doc/lighttpd.1 lighttpd-1.3.10/doc/lighttpd.1 ---- lighttpd-1.3.10.orig/doc/lighttpd.1 2005-02-14 09:06:23.787031048 -0500 -+++ lighttpd-1.3.10/doc/lighttpd.1 2005-02-14 09:06:57.909397488 -0500 -@@ -5,7 +5,7 @@ - lighttpd -D -f <configfile> - .SH DESCRIPTION - .SH FILES --/etc/lighttpd/lighttpd.conf -+/etc/lighttpd.conf - .SH CONFORMING TO - HTTP/1.0 - HTTP/1.0 -diff --exclude='*~' -urN lighttpd-1.3.10.orig/doc/lighttpd.conf lighttpd-1.3.10/doc/lighttpd.conf ---- lighttpd-1.3.10.orig/doc/lighttpd.conf 2005-02-14 09:06:23.787031048 -0500 -+++ lighttpd-1.3.10/doc/lighttpd.conf 2005-02-14 09:08:14.745722997 -0500 -@@ -35,10 +35,10 @@ - - ## a static document-root, for virtual-hosting take look at the - ## server.virtual-* options --server.document-root = "/www/pages/" -+server.document-root = "/var/www/localhost/htdocs/" - - ## where to send error-messages to --server.errorlog = "/www/logs/lighttpd.error.log" -+server.errorlog = "/var/log/lighttpd/error.log" - - # files to check for if .../ is requested - server.indexfiles = ( "index.php", "index.html", -@@ -103,7 +103,7 @@ - # server.tag = "lighttpd" - - #### accesslog module --accesslog.filename = "/www/logs/access.log" -+accesslog.filename = "/var/log/lighttpd/access.log" - - ## deny access the file-extensions - # -@@ -164,10 +164,10 @@ - #server.chroot = "/" - - ## change uid to <uid> (default: don't care) --#server.username = "wwwrun" -+server.username = "lighttpd" - - ## change uid to <uid> (default: don't care) --#server.groupname = "wwwrun" -+server.groupname = "lighttpd" - - #### compress module - #compress.cache-dir = "/tmp/lighttpd/cache/compress/" diff --git a/www-servers/lighttpd/files/lighttpd-1.3.10-php.diff b/www-servers/lighttpd/files/lighttpd-1.3.10-php.diff deleted file mode 100644 index 6afcda2a8207..000000000000 --- a/www-servers/lighttpd/files/lighttpd-1.3.10-php.diff +++ /dev/null @@ -1,35 +0,0 @@ -diff -urN lighttpd-1.3.10.orig/doc/lighttpd.conf lighttpd-1.3.10/doc/lighttpd.conf ---- lighttpd-1.3.10.orig/doc/lighttpd.conf 2005-02-06 23:58:57.661234800 -0500 -+++ lighttpd-1.3.10/doc/lighttpd.conf 2005-02-07 00:00:50.500080688 -0500 -@@ -19,7 +19,7 @@ - # "mod_auth", - # "mod_status", - # "mod_setenv", --# "mod_fastcgi", -+ "mod_fastcgi", - # "mod_proxy", - # "mod_simple_vhost", - # "mod_evhost", -@@ -186,14 +186,14 @@ - - #### fastcgi module - ## read fastcgi.txt for more info --#fastcgi.server = ( ".php" => --# ( "localhost" => --# ( --# "socket" => "/tmp/php-fastcgi.socket", --# "bin-path" => "/usr/local/bin/php" --# ) --# ) --# ) -+fastcgi.server = ( ".php" => -+ ( "localhost" => -+ ( -+ "host" => "127.0.0.1", -+ "port" => 1026 -+ ) -+ ) -+ ) - - #### CGI module - #cgi.assign = ( ".pl" => "/usr/bin/perl", diff --git a/www-servers/lighttpd/files/lighttpd-1.3.10-upstream.diff b/www-servers/lighttpd/files/lighttpd-1.3.10-upstream.diff deleted file mode 100644 index c28dbd688765..000000000000 --- a/www-servers/lighttpd/files/lighttpd-1.3.10-upstream.diff +++ /dev/null @@ -1,64 +0,0 @@ -diff --exclude='*~' -urN lighttpd-1.3.10.orig/src/base.h lighttpd-1.3.10/src/base.h ---- lighttpd-1.3.10.orig/src/base.h 2005-02-14 08:59:15.496738424 -0500 -+++ lighttpd-1.3.10/src/base.h 2005-02-14 09:02:47.454746494 -0500 -@@ -45,6 +45,13 @@ - # define SSIZE_MAX ((size_t)~0 >> 1) - #endif - -+/* for MacOS X */ -+#ifdef __APPLE__ -+# include <crt_externs.h> -+# define environ (* _NSGetEnviron()) -+#else -+ extern char **environ; -+#endif - - /* for solaris 2.5 and NetBSD 1.3.x */ - #ifndef HAVE_SOCKLEN_T -diff --exclude='*~' -urN lighttpd-1.3.10.orig/src/cgi.c lighttpd-1.3.10/src/cgi.c ---- lighttpd-1.3.10.orig/src/cgi.c 2005-02-14 08:59:15.462744036 -0500 -+++ lighttpd-1.3.10/src/cgi.c 2005-02-14 09:00:45.386898712 -0500 -@@ -686,16 +686,17 @@ - - int to_cgi_fds[2]; - int from_cgi_fds[2]; -- struct stat st; -- -+ - #ifndef __WIN32 -- -- /* stat the exec file */ -- if (-1 == (stat(cgi_handler->ptr, &st))) { -- log_error_write(srv, __FILE__, __LINE__, "sbss", -- "stat for cgi-handler", cgi_handler, -- "failed:", strerror(errno)); -- return -1; -+ struct stat st; -+ if (cgi_handler->used > 1) { -+ /* stat the exec file */ -+ if (-1 == (stat(cgi_handler->ptr, &st))) { -+ log_error_write(srv, __FILE__, __LINE__, "sbss", -+ "stat for cgi-handler", cgi_handler, -+ "failed:", strerror(errno)); -+ return -1; -+ } - } - - if (pipe(to_cgi_fds)) { -diff --exclude='*~' -urN lighttpd-1.3.10.orig/src/response.c lighttpd-1.3.10/src/response.c ---- lighttpd-1.3.10.orig/src/response.c 2005-02-14 08:59:15.462744036 -0500 -+++ lighttpd-1.3.10/src/response.c 2005-02-14 09:04:16.505044865 -0500 -@@ -1245,13 +1245,6 @@ - default: - break; - } -- -- if (HANDLER_GO_ON == file_cache_get_entry(srv, con, srv->tmp_buf, &(con->fce))) { -- /* rewrite uri.path to the real path (/ -> /index.php) */ -- buffer_append_string_buffer(con->uri.path, ds->value); -- -- break; -- } - } - - if (k == con->conf.indexfiles->used) { diff --git a/www-servers/lighttpd/files/lighttpd-1.4.0-stat-cache.diff b/www-servers/lighttpd/files/lighttpd-1.4.0-stat-cache.diff deleted file mode 100644 index 73451a021c50..000000000000 --- a/www-servers/lighttpd/files/lighttpd-1.4.0-stat-cache.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- lighttpd-1.4.0/src/stat_cache.c 2005-08-11 01:26:16.000000000 +0300 -+++ lighttpd-1.4.0/src/stat_cache.c 2005-08-19 21:22:20.000000000 +0300 -@@ -181,7 +181,7 @@ - } - - #ifdef HAVE_XATTR --static int stat_cache_entry_attr_get(buffer *buf, char *name) { -+static int stat_cache_attr_get(buffer *buf, char *name) { - int attrlen; - int ret; - diff --git a/www-servers/lighttpd/files/lighttpd.initd b/www-servers/lighttpd/files/lighttpd.initd new file mode 100644 index 000000000000..ad1f77321579 --- /dev/null +++ b/www-servers/lighttpd/files/lighttpd.initd @@ -0,0 +1,46 @@ +#!/sbin/runscript +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/files/lighttpd.initd,v 1.4 2005/08/22 16:01:18 ka0ttic Exp $ + +opts="depend checkconfig start stop" + +LIGHTTPD_CONF="/etc/lighttpd/lighttpd.conf" +LIGHTTPD_PID="/var/run/lighttpd.pid" + +depend() { + need net + use mysql logger spawn-fcgi ldap + after sshd +} + +checkconfig() { + if [[ ! -f ${LIGHTTPD_CONF} ]] ; then + ewarn "${LIGHTTPD_CONF} does not exist." + return 1 + fi + + /usr/sbin/lighttpd -t -f ${LIGHTTPD_CONF} >/dev/null +} + +start() { + checkconfig || return 1 + + ebegin "Starting lighttpd" + start-stop-daemon --start --quiet \ + --pidfile ${LIGHTTPD_PID} \ + --exec /usr/sbin/lighttpd -- -f ${LIGHTTPD_CONF} + eend $? +} + +stop() { + local rv=0 + ebegin "Stopping lighttpd" + if start-stop-daemon --stop --quiet --pidfile ${LIGHTTPD_PID} \ + --exec /usr/sbin/lighttpd ; then + rm -f /var/run/lighttpd.pid + else + rv=1 + fi + eend $rv +} diff --git a/www-servers/lighttpd/files/lighttpd.logrotate b/www-servers/lighttpd/files/lighttpd.logrotate new file mode 100644 index 000000000000..4646dad39b94 --- /dev/null +++ b/www-servers/lighttpd/files/lighttpd.logrotate @@ -0,0 +1,17 @@ +# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/files/lighttpd.logrotate,v 1.1 2005/08/22 16:01:18 ka0ttic Exp $ +# lighttpd logrotate script for Gentoo + +/var/log/lighttpd/*.log { + daily + missingok + copytruncate + rotate 7 + compress + notifempty + sharedscripts + postrotate + if [ -f /var/run/lighttpd.pid ]; then \ + /etc/init.d/lighttpd restart > /dev/null 2>&1 || true ; \ + fi; + endscript +} diff --git a/www-servers/lighttpd/lighttpd-1.3.10-r1.ebuild b/www-servers/lighttpd/lighttpd-1.3.10-r1.ebuild deleted file mode 100644 index a3a4a3cacb42..000000000000 --- a/www-servers/lighttpd/lighttpd-1.3.10-r1.ebuild +++ /dev/null @@ -1,90 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/lighttpd-1.3.10-r1.ebuild,v 1.8 2005/08/20 14:34:37 ka0ttic Exp $ - -inherit eutils - -RESTRICT="test" - -DESCRIPTION="lightweight high-performance web server" -HOMEPAGE="http://www.lighttpd.net/" -SRC_URI="http://www.lighttpd.net/download/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~ppc x86" -IUSE="mysql ssl php xattr ldap" - -RDEPEND="app-arch/bzip2 - >=dev-libs/libpcre-3.1 - >=sys-libs/zlib-1.1 - xattr? ( sys-apps/attr ) - ldap? ( >=net-nds/openldap-2.1.26 ) - mysql? ( >=dev-db/mysql-4.0.0 ) - ssl? ( >=dev-libs/openssl-0.9.7 ) - php? ( - >=dev-php/php-cgi-4.3.0 - !net-www/spawn-fcgi - )" - -LIGHTTPD_DIR="/var/www/localhost/htdocs/" -LOG_DIR="/var/log/lighttpd/" - -pkg_setup() { - enewgroup lighttpd - enewuser lighttpd -1 -1 "${LIGHTTPD_DIR}" lighttpd -} - -src_unpack() { - unpack ${A} - cd ${S} - epatch ${FILESDIR}/${P}-upstream.diff - epatch ${FILESDIR}/${P}-gentoo.diff - use php && epatch ${FILESDIR}/${P}-php.diff -} - -src_compile() { - local my_conf="--libdir=/usr/$(get_libdir)/${PN}" - - econf ${my_conf} \ - $(use_with mysql) \ - $(use_with ldap) \ - $(use_with xattr attr) \ - $(use_with ssl openssl) || die "econf failed" - - emake || die "emake failed" -} - -src_install() { - make DESTDIR="${D}" install || die "make install failed" - - insinto /etc - doins doc/lighttpd.conf || die "doins failed" - - newinitd ${FILESDIR}/${P}.initd ${PN} - - if use php ; then - newinitd ${FILESDIR}/spawn-fcgi.initd spawn-fcgi - newconfd ${FILESDIR}/spawn-fcgi.confd spawn-fcgi - fi - - keepdir ${LIGHTTPD_DIR} ${LOG_DIR} || die "keepdir failed" - fowners lighttpd:lighttpd ${LOG_DIR} || die "fowners failed" - - dodoc README COPYING - cd doc - dodoc *.txt *.sh *.ps.gz - newdoc lighttpd.conf lighttpd.conf.example || die "newdoc failed" -} - -pkg_postinst () { - echo - einfo "lighttpd.conf has moved from /etc/conf.d to /etc" - if [[ -f ${ROOT}/etc/conf.d/spawn-fcgi.conf ]] ; then - einfo - einfo "spawn-fcgi is now included with lighttpd" - einfo "spawn-fcgi's init script configuration is now located" - einfo "at /etc/conf.d/spawn-fcgi." - fi - echo -} diff --git a/www-servers/lighttpd/lighttpd-1.3.15.ebuild b/www-servers/lighttpd/lighttpd-1.3.15.ebuild deleted file mode 100644 index 13ecdee37f0a..000000000000 --- a/www-servers/lighttpd/lighttpd-1.3.15.ebuild +++ /dev/null @@ -1,101 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/lighttpd-1.3.15.ebuild,v 1.8 2005/08/20 14:34:37 ka0ttic Exp $ - -inherit eutils - -RESTRICT="test" - -DESCRIPTION="lightweight high-performance web server" -HOMEPAGE="http://www.lighttpd.net/" -SRC_URI="http://www.lighttpd.net/download/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~mips ~ppc ~x86" -IUSE="mysql ssl php xattr ldap ipv6" - -RDEPEND="app-arch/bzip2 - >=dev-libs/libpcre-3.1 - >=sys-libs/zlib-1.1 - xattr? ( sys-apps/attr ) - ldap? ( >=net-nds/openldap-2.1.26 ) - mysql? ( >=dev-db/mysql-4.0.0 ) - ssl? ( >=dev-libs/openssl-0.9.7 ) - php? ( - >=dev-php/php-cgi-4.3.0 - !net-www/spawn-fcgi - )" - -LIGHTTPD_DIR="/var/www/localhost/htdocs/" -LOG_DIR="/var/log/lighttpd/" - -pkg_setup() { - enewgroup lighttpd - enewuser lighttpd -1 -1 "${LIGHTTPD_DIR}" lighttpd -} - -src_unpack() { - unpack ${A} - cd ${S} - epatch ${FILESDIR}/${PN}-1.3.11-gentoo.diff - epatch ${FILESDIR}/${PN}-1.3.13-no-mysql-means-no-mysql.diff - epatch ${FILESDIR}/${PN}-1.3.13-zope-deserves-lovins-too.diff - epatch ${FILESDIR}/${PN}-1.3.13-valid-user.diff - epatch ${FILESDIR}/${PN}-1.3.13-ldap-binddn.diff - use php && epatch ${FILESDIR}/${PN}-1.3.13-php.diff -} - -src_compile() { - local myconf="--libdir=/usr/$(get_libdir)/${PN}" - - # somehow during the process the BSD COPYING gets - # overwritten with a GPL one - mv COPYING{,.orig} - einfo "Regenerating automake/autoconf files" - autoreconf -f -i || die "autoreconf failed" - mv COPYING{.orig,} - - econf ${myconf} \ - $(use_enable ipv6) \ - $(use_with mysql) \ - $(use_with ldap) \ - $(use_with xattr attr) \ - $(use_with ssl openssl) || die "econf failed" - - emake || die "emake failed" -} - -src_install() { - make DESTDIR="${D}" install || die "make install failed" - - insinto /etc - doins doc/lighttpd.conf || die "doins failed" - - newinitd ${FILESDIR}/${PN}-1.3.10.initd ${PN} - - if use php ; then - newinitd ${FILESDIR}/spawn-fcgi.initd spawn-fcgi - newconfd ${FILESDIR}/spawn-fcgi.confd spawn-fcgi - fi - - keepdir ${LIGHTTPD_DIR} ${LOG_DIR} || die "keepdir failed" - fowners lighttpd:lighttpd ${LOG_DIR} || die "fowners failed" - - dodoc README COPYING - cd doc - dodoc *.txt *.sh *.ps.gz - newdoc lighttpd.conf lighttpd.conf.example || die "newdoc failed" -} - -pkg_postinst () { - echo - einfo "lighttpd.conf has moved from /etc/conf.d to /etc" - if [[ -f ${ROOT}/etc/conf.d/spawn-fcgi.conf ]] ; then - einfo - einfo "spawn-fcgi is now included with lighttpd" - einfo "spawn-fcgi's init script configuration is now located" - einfo "at /etc/conf.d/spawn-fcgi." - fi - echo -} diff --git a/www-servers/lighttpd/lighttpd-1.4.0.ebuild b/www-servers/lighttpd/lighttpd-1.4.0.ebuild deleted file mode 100644 index b3c472f09b85..000000000000 --- a/www-servers/lighttpd/lighttpd-1.4.0.ebuild +++ /dev/null @@ -1,89 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/lighttpd-1.4.0.ebuild,v 1.4 2005/08/20 14:34:37 ka0ttic Exp $ - -inherit eutils - -RESTRICT="test" - -DESCRIPTION="lightweight high-performance web server" -HOMEPAGE="http://www.lighttpd.net/" -SRC_URI="http://www.lighttpd.net/download/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~mips ~ppc ~x86" -IUSE="mysql ssl php xattr ldap ipv6" - -RDEPEND="app-arch/bzip2 - >=dev-libs/libpcre-3.1 - >=sys-libs/zlib-1.1 - xattr? ( sys-apps/attr ) - ldap? ( >=net-nds/openldap-2.1.26 ) - mysql? ( >=dev-db/mysql-4.0.0 ) - ssl? ( >=dev-libs/openssl-0.9.7 ) - php? ( - >=dev-php/php-cgi-4.3.0 - !net-www/spawn-fcgi - )" - -LIGHTTPD_DIR="/var/www/localhost/htdocs/" -LOG_DIR="/var/log/lighttpd/" - -src_unpack() { - unpack ${A} - cd ${S} - epatch ${FILESDIR}/${PN}-1.3.11-gentoo.diff - use php && epatch ${FILESDIR}/${PN}-1.3.13-php.diff - epatch ${FILESDIR}/${P}-stat-cache.diff -} - -src_compile() { - econf \ - --libdir=/usr/$(get_libdir)/${PN} \ - --enable-lfs \ - $(use_enable ipv6) \ - $(use_with mysql) \ - $(use_with ldap) \ - $(use_with xattr attr) \ - $(use_with ssl openssl) || die "econf failed" - - emake || die "emake failed" -} - -src_install() { - keepdir ${LIGHTTPD_DIR} ${LOG_DIR} - - make DESTDIR="${D}" install || die "make install failed" - - insinto /etc - doins doc/lighttpd.conf || die "doins failed" - - newinitd ${FILESDIR}/${PN}-1.3.10.initd ${PN} - - if use php ; then - newinitd ${FILESDIR}/spawn-fcgi.initd spawn-fcgi - newconfd ${FILESDIR}/spawn-fcgi.confd spawn-fcgi - fi - - dodoc README COPYING - cd doc - dodoc *.txt *.sh - newdoc lighttpd.conf lighttpd.conf.example || die "newdoc failed" -} - -pkg_preinst() { - enewgroup lighttpd || die "enewgroup failed" - enewuser lighttpd -1 -1 "${LIGHTTPD_DIR}" lighttpd || die "enewuser failed" - chown lighttpd:lighttpd ${IMAGE}${LOG_DIR} -} - -pkg_postinst () { - if [[ -f ${ROOT}/etc/conf.d/spawn-fcgi.conf ]] ; then - einfo - einfo "spawn-fcgi is now included with lighttpd" - einfo "spawn-fcgi's init script configuration is now located" - einfo "at /etc/conf.d/spawn-fcgi." - einfo - fi -} diff --git a/www-servers/lighttpd/lighttpd-1.4.1.ebuild b/www-servers/lighttpd/lighttpd-1.4.1.ebuild new file mode 100644 index 000000000000..3b1783e0fa8b --- /dev/null +++ b/www-servers/lighttpd/lighttpd-1.4.1.ebuild @@ -0,0 +1,186 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/lighttpd-1.4.1.ebuild,v 1.1 2005/08/22 16:01:18 ka0ttic Exp $ + +inherit eutils check-kernel toolchain-funcs + +# bug #97661 - tests try to load modules from /usr/lib/lighttpd. +# Needless to say, this will fail because either +# a) they don't exist since this is a first install, or +# b) they do exist, but they are from the previously installed version +RESTRICT="test" + +DESCRIPTION="Lightweight high-performance web server" +HOMEPAGE="http://www.lighttpd.net/" +SRC_URI="http://www.lighttpd.net/download/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~mips ~ppc ~x86" +IUSE="doc fam gdbm ipv6 ldap lua mysql php ssl webdav xattr" + +RDEPEND="app-arch/bzip2 + >=sys-libs/zlib-1.1 + >=dev-libs/libpcre-3.1 + fam? ( app-admin/gamin ) + gdbm? ( sys-libs/gdbm ) + ldap? ( >=net-nds/openldap-2.1.26 ) + lua? ( dev-lang/lua ) + mysql? ( >=dev-db/mysql-4.0.0 ) + php? ( + >=dev-php/php-cgi-4.3.0 + !net-www/spawn-fcgi + ) + ssl? ( >=dev-libs/openssl-0.9.7 ) + webdav? ( + dev-libs/libxml2 + >=dev-db/sqlite-3 + ) + xattr? ( sys-apps/attr )" + +DEPEND="${RDEPEND} + doc? ( dev-python/docutils )" + +# update certain parts of lighttpd.conf based on +# conditionals (such as kernel, USE flags, etc). +update_config() { + local config="/etc/lighttpd/lighttpd.conf" + + # enable mod_fastcgi settings + use php && \ + dosed 's|#.*\(include.*fastcgi.*$\)|\1|' ${config} + + # enable stat() caching + use fam && \ + dosed 's|#\(.*stat-cache.*$\)|\1|' ${config} + + # Note to arch maintainers, the "linux-sysepoll" event-handler doesn't + # seem to work on mips even with a 2.6 kernel, so please make sure you + # test the respective server.event-handler option before adding your + # arch. + case "$(tc-arch)" in + x86) + # use appropriate server.event-handler directive based on kernel + if use kernel_linux ; then + + is_2_6_kernel && \ + dosed 's|#\(.*event-handler.*sysepoll.*$\)|\1|' ${config} + + is_2_4_kernel && + dosed 's|#\(.*event-handler.*rtsig.*$\)|\1|' ${config} + + elif use kernel_FreeBSD ; then + dosed 's|#\(.*event-handler.*kqueue.*$\)|\1|' ${config} + fi + ;; + *) + ;; + esac +} + +src_unpack() { + unpack ${A} + cd ${S} + +# EPATCH_SUFFIX="diff" epatch ${FILESDIR}/${PV} + + # dev-python/docutils installs rst2html.py not rst2html + sed -i -e 's|\(rst2html\)|\1.py|g' doc/Makefile.in || \ + die "sed doc/Makefile.in failed" +} + +src_compile() { +# einfo "Regenerating autoconf/automake files" +# libtoolize --copy --force || die "libtoolize failed" +# aclocal || die "aclocal failed" +# autoheader || die "autoheader failed" +# automake --add-missing --copy || die "automake failed" +# autoconf || die "autoconf failed" + + local myconf="--libdir=/usr/$(get_libdir)/${PN}" + + # upstream recommends disabling LFS support with a 2.4.x kernel + if is_2_4_kernel ; then + myconf="${myconf} --disable-lfs" + else + myconf="${myconf} --enable-lfs" + fi + + econf ${myconf} \ + $(use_enable ipv6) \ + $(use_with fam gamin) \ + $(use_with gdbm) \ + $(use_with lua) \ + $(use_with ldap) \ + $(use_with mysql) \ + $(use_with ssl openssl) \ + $(use_with webdav webdav-props) \ + $(use_with xattr attr) \ + || die "econf failed" + + emake || die "emake failed" + + if use doc ; then + einfo "Building HTML documentation" + cd doc + emake html || die "failed to build HTML documentation" + fi +} + +src_install() { + make DESTDIR="${D}" install || die "make install failed" + + # init script stuff + newinitd ${FILESDIR}/lighttpd.initd lighttpd || die + + if use php ; then + newinitd ${FILESDIR}/spawn-fcgi.initd spawn-fcgi || die + newconfd ${FILESDIR}/spawn-fcgi.confd spawn-fcgi || die + fi + + # configs + insinto /etc/lighttpd + doins ${FILESDIR}/conf/*.conf + + # update lighttpd.conf directives based on conditionals + update_config + + # docs + dodoc AUTHORS README COPYING INSTALL NEWS ChangeLog doc/*.sh + newdoc doc/lighttpd.conf lighttpd.conf.distrib + + use doc && dohtml -r doc/* + + docinto txt + dodoc doc/*.txt + + # logrotate + insinto /etc/logrotate.d + newins ${FILESDIR}/lighttpd.logrotate lighttpd || die + + keepdir /var/log/lighttpd /var/www/localhost/htdocs +} + +pkg_preinst() { + enewgroup lighttpd + enewuser lighttpd -1 -1 /var/www/localhost/htdocs lighttpd + fowners lighttpd:lighttpd /var/log/lighttpd +} + +pkg_postinst () { + echo + if [[ -f ${ROOT}etc/conf.d/spawn-fcgi.conf ]] ; then + einfo "spawn-fcgi is now included with lighttpd" + einfo "spawn-fcgi's init script configuration is now located" + einfo "at /etc/conf.d/spawn-fcgi." + echo + fi + + if [[ -f ${ROOT}etc/lighttpd.conf ]] ; then + ewarn "As of lighttpd-1.4.0-r1, Gentoo has a customized configuration," + ewarn "which is now located in /etc/lighttpd. Please migrate your" + ewarn "existing configuration." + ebeep 3 + fi + echo +} diff --git a/www-servers/lighttpd/metadata.xml b/www-servers/lighttpd/metadata.xml index 87c085844c38..6e3ee5d0a1ab 100644 --- a/www-servers/lighttpd/metadata.xml +++ b/www-servers/lighttpd/metadata.xml @@ -2,4 +2,17 @@ <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <herd>www-servers</herd> + <maintainer> + <email>ka0ttic@gentoo.org</email> + <name>Aaron Walker</name> + </maintainer> + <longdescription lang="en"> + lighttpd a secure, fast, compliant and very flexible web-server + which has been optimized for high-performance environments. It has a very + low memory footprint compared to other webservers and takes care of cpu-load. + Its advanced feature-set (FastCGI, CGI, Auth, Output-Compression, + URL-Rewriting and many more) make lighttpd the perfect webserver-software + for every server that is suffering load problems. + </longdescription> </pkgmetadata> + |