diff options
Diffstat (limited to 'user/lighttpd')
-rw-r--r-- | user/lighttpd/APKBUILD | 85 | ||||
-rw-r--r-- | user/lighttpd/lighttpd.conf | 62 | ||||
-rw-r--r-- | user/lighttpd/lighttpd.initd | 2 | ||||
-rw-r--r-- | user/lighttpd/mime-types.conf | 79 |
4 files changed, 68 insertions, 160 deletions
diff --git a/user/lighttpd/APKBUILD b/user/lighttpd/APKBUILD index 5f768bbdd..73e9cdb1b 100644 --- a/user/lighttpd/APKBUILD +++ b/user/lighttpd/APKBUILD @@ -1,57 +1,67 @@ # Contributor: Valery Kartel <valery.kartel@gmail.com> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=lighttpd -pkgver=1.4.54 -pkgrel=2 +pkgver=1.4.79 +pkgrel=0 pkgdesc="A secure, fast, compliant and very flexible web-server" -url="http://www.lighttpd.net/" +url="https://www.lighttpd.net" +pkgusers="lighttpd" +pkggroups="lighttpd" arch="all" license="BSD-3-Clause" +depends="" +makedepends=" + attr-dev + flex + libxml2-dev + lua5.3-dev + meson + openldap-dev + openssl-dev + pcre2-dev + sqlite-dev + zlib-dev + zstd-dev + " +checkdepends="perl" +subpackages=" + $pkgname-doc + $pkgname-openrc + $pkgname-mod_auth + $pkgname-mod_webdav + " install="$pkgname.pre-install $pkgname.pre-upgrade" -pkgusers="lighttpd" -pkggroups="lighttpd" -makedepends="attr-dev bzip2-dev flex gamin-dev libev-dev libxml2-dev - openldap-dev openssl-dev pcre-dev sqlite-dev zlib-dev" -subpackages="$pkgname-doc $pkgname-dbg $pkgname-mod_auth $pkgname-openrc - $pkgname-mod_webdav" -source="http://download.lighttpd.net/lighttpd/releases-1.4.x/$pkgname-$pkgver.tar.xz +source="https://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-$pkgver.tar.xz $pkgname.initd $pkgname.confd $pkgname.logrotate lighttpd.conf - mime-types.conf mod_cgi.conf mod_fastcgi.conf mod_fastcgi_fpm.conf " build() { - ./configure \ - --build=$CBUILD \ - --host=$CHOST \ - --prefix=/usr \ - --disable-dependency-tracking \ - --enable-lfs \ - --libdir=/usr/lib/lighttpd \ - --without-mysql \ - --with-attr \ - --with-fam \ - --with-webdav-props \ - --with-webdav-locks \ - --without-gdbm \ - --with-bzip2 \ - --with-ldap \ - --with-openssl \ - --with-libev - make + meson \ + -Dprefix=/usr \ + -Dwith_ldap=enabled \ + -Dwith_lua=true \ + -Dwith_openssl=true \ + -Dwith_pcre2=true \ + -Dwith_webdav_locks=enabled \ + -Dwith_webdav_props=enabled \ + -Dwith_xattr=true \ + -Dwith_zstd=enabled \ + . output + meson compile -C output } check() { - make check + meson test --no-rebuild --print-errorlogs -C output } package() { - make DESTDIR="$pkgdir" install + DESTDIR="$pkgdir" meson install --no-rebuild -C output # create dirs install -d -m755 -o lighttpd -g lighttpd \ @@ -70,7 +80,7 @@ package() { "$pkgdir"/etc/logrotate.d/lighttpd # config files - local i; for i in lighttpd.conf mime-types.conf mod_cgi.conf \ + local i; for i in lighttpd.conf mod_cgi.conf \ mod_fastcgi.conf mod_fastcgi_fpm.conf do install -m644 "$srcdir"/$i "$pkgdir"/etc/lighttpd/$i @@ -96,12 +106,13 @@ mod_webdav() { _mv_mod mod_webdav } -sha512sums="aa180a2751711a77b9da91a6a285c967d2c183ccbabe3e9064aea74e44629c3b0227ac98c7d720c8d4d223ce4b31e8b221b05b928adc917b199ab1015fcdba37 lighttpd-1.4.54.tar.xz -f2f3c5c7731550237fd75a8de66275f427eaf897cffff7ac7ef44178328ad8fad6c4ec6654759bfc665cbaf7991ddcdf0aaa916831c8b6aa440192d57b242038 lighttpd.initd +sha512sums=" +e0f1bb2cfca5e81001ea30d13f088425dfc7acbec924ecddf438eb6326ab3158a61c6c4aaee0b68a90666d1cb987ce94b1f6a48afd92485cc995db5b58265f83 lighttpd-1.4.79.tar.xz +a74fb8394fb77fca2a08bdcfc79d4e13de6aca7bc4ed842b7e05f7f3a9cc85dccaa4971ba8fd0edfaa19da8d3870a743b713d9e51f1cbfe5b8e2843bb7fe5346 lighttpd.initd 9d2ab5deb7353ebf290e90936b511941df440859c78589d0bcf130ef69a5e9c79e4d318548b6b118df002083c46f7476230a28954b7a10a9dbd05040e02b1291 lighttpd.confd 0536b4f21d2e8659f7831b45998c13d9f6051ae7ecde13be01f372f837d255bfc4e211de48a7686cc743d53aa9c08ab3f10ec19788896dcf8356b90053ca7a16 lighttpd.logrotate -e56ee836fa815c98c711f9381a8552ca94e1841aee5ddeee83631c385ccc556e966331499f4784982385f7ed4177062d3349705fd24de2ec5f1544ab1cc424de lighttpd.conf -a3f2f5763885d7e4f510491b24164e34aaf62bb02daa12991575dc64335c12668355af5bb8d6ce191eb4e9cce95324b1f7c9ba61b323b4e7b50a1e03e021afcf mime-types.conf +ba622693023f38b7ecb6234e29494cbec9cc94786a4d9d544a293e08208aaebb038bf443e205f7c5b8780c6c723a800b7f4d6ec7aaad75ebc65ac9b4f1cf064f lighttpd.conf 27cc638d8068dcf47bd9db44943d1db6c6f4e8e6abd6b42af7cea004b1c093440068541d98c68f8bea70b956713adaf8ed59a4b642dea826ee8620a05f8cfde5 mod_cgi.conf 1d15b84c03fb648a0e67ab5c5411b85478b4454c44bc2959cc96d1700eeadd7ff429520a5f1550db6527267646622dccd3d47d3fd1258869fccaf5c22d4ad4b2 mod_fastcgi.conf -f9efc4b70d825600f5356c30e57d0b6cac11c01739337f7192c09c2cfd96cb76c8328b11d818ea4c2addc1a6d253975b84700106ae75854d55d0df73e220bd2b mod_fastcgi_fpm.conf" +f9efc4b70d825600f5356c30e57d0b6cac11c01739337f7192c09c2cfd96cb76c8328b11d818ea4c2addc1a6d253975b84700106ae75854d55d0df73e220bd2b mod_fastcgi_fpm.conf +" diff --git a/user/lighttpd/lighttpd.conf b/user/lighttpd/lighttpd.conf index afb57fb17..e8807efaf 100644 --- a/user/lighttpd/lighttpd.conf +++ b/user/lighttpd/lighttpd.conf @@ -16,20 +16,17 @@ server.modules = ( # "mod_redirect", # "mod_alias", "mod_access", -# "mod_cml", -# "mod_trigger_b4_dl", # "mod_auth", # "mod_status", "mod_setenv", +# "mod_magnet", # "mod_proxy", # "mod_simple_vhost", # "mod_evhost", # "mod_userdir", - "mod_compress", + "mod_deflate", # "mod_ssi", -# "mod_usertrack", "mod_expire", -# "mod_secdownload", # "mod_rrdtool", # "mod_webdav", "mod_accesslog", @@ -38,7 +35,6 @@ server.modules = ( ######## Inclusions ######## -include "mime-types.conf" # uncomment for cgi support # include "mod_cgi.conf" # uncomment for php/fastcgi support @@ -58,14 +54,10 @@ server.errorlog = var.logdir + "/error.log" # To log errors to syslog instead, use: # server.errorlog-use-syslog = "enable" -server.indexfiles = ("index.html", "index.htm", "default.htm") +index-file.names = ("index.html", "index.htm", "default.htm") # server.tag = "lighttpd" -server.follow-symlink = "enable" - -server.event-handler = "linux-sysepoll" - # To chroot to a directory: # server.chroot = "/" @@ -82,8 +74,8 @@ server.event-handler = "linux-sysepoll" # -> ..../status-404.html for 'File not found' # server.errorfile-prefix = var.basedir + "/error/status-" -# FAM support for caching stat() calls -server.stat-cache-engine = "fam" +# inotify support for caching stat() calls +#server.stat-cache-engine = "inotify" # which extensions should not be handled via static-file transfer # (extensions that are usually handled by mod_cgi, mod_fastcgi, etc). @@ -130,26 +122,15 @@ url.access-deny = ("~", ".inc") ######## SSL config ######## # See ssl.txt in lighttpd-doc package for more info. -# The defaults here are NOT the server defaults. You need to uncomment -# them to use them. They are HIGHLY recommended; by default, lighttpd -# will serve older TLS protocols that may be vulnerable to attack. # #ssl.engine = "enable" -#ssl.honor-cipher-order = "enable" -#ssl.disable-client-renegotiation = "enable" -# pemfile is cert+privkey, ca-file is the intermediate chain in one file -#ssl.pemfile = "/path/to/signed_cert_plus_private_key.pem" -#ssl.ca-file = "/path/to/intermediate_certificate.pem" +# pemfile is certificate + intermediate chain in one file +# privkey is certificate private key +#ssl.pemfile = "/path/to/fullchain.pem" +#ssl.privkey = "/path/to/privkey.pem" # ECDH/ECDHE ciphers curve strength (see `openssl ecparam -list_curves`) -#ssl.ec-curve = "secp384r1" -# Environment flag for HTTPS enabled -#setenv.add-environment = ( -# "HTTPS" => "on" -#) +#ssl.openssl.ssl-conf-cmd += ("Groups" => "secp384r1") # Modern configuration, tweak to your needs -#ssl.use-sslv2 = "disable" -#ssl.use-sslv3 = "disable" -#ssl.cipher-list = "ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256" # HSTS(15768000 seconds = 6 months) #setenv.add-response-header = ( # "Strict-Transport-Security" => "max-age=15768000;" @@ -163,9 +144,15 @@ url.access-deny = ("~", ".inc") #status.config-url = "/server-config" -######## mod_compress config ######## -compress.cache-dir = var.statedir + "/cache/compress" -compress.filetype = ("text/plain", "text/html") +######## mod_deflate config ######## +deflate.cache-dir = var.statedir + "/cache/compress" +deflate.mimetypes = ("text/plain", "text/html") +deflate.allowed-encodings = ( "zstd", "gzip", "deflate" ) + + +######## mod_magnet config ######## +# programmatic manipulation of requests using lua +# https://wiki.lighttpd.net/mod_magnet ######## mod_proxy config ######## @@ -231,17 +218,6 @@ compress.filetype = ("text/plain", "text/html") # "/asdhas/" => "access plus 1 seconds 2 minutes" #) -# {{{ 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_webdav config ######## # lighttpd can act as a WebDAV server. diff --git a/user/lighttpd/lighttpd.initd b/user/lighttpd/lighttpd.initd index 614cb2132..597b9070b 100644 --- a/user/lighttpd/lighttpd.initd +++ b/user/lighttpd/lighttpd.initd @@ -25,7 +25,7 @@ checkconfig() { ewarn "is not set. Falling back to lighttpd.pid" LIGHTTPD_PID="/run/lighttpd.pid" fi - /usr/sbin/lighttpd -t -f ${LIGHTTPD_CONF} >/dev/null + /usr/sbin/lighttpd -tt -f ${LIGHTTPD_CONF} } start() { diff --git a/user/lighttpd/mime-types.conf b/user/lighttpd/mime-types.conf deleted file mode 100644 index f24d4d858..000000000 --- a/user/lighttpd/mime-types.conf +++ /dev/null @@ -1,79 +0,0 @@ -############################################################################### -# 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.4 2010/03/14 21:45:18 bangert Exp $ -############################################################################### - -# {{{ mime types -mimetype.assign = ( - ".svg" => "image/svg+xml", - ".svgz" => "image/svg+xml", - ".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", - ".dmg" => "application/x-apple-diskimage", - ".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", - ".log" => "text/plain", - ".text" => "text/plain", - ".txt" => "text/plain", - ".diff" => "text/plain", - ".patch" => "text/plain", - ".ebuild" => "text/plain", - ".eclass" => "text/plain", - ".rtf" => "application/rtf", - ".bmp" => "image/bmp", - ".tif" => "image/tiff", - ".tiff" => "image/tiff", - ".ico" => "image/x-icon", - ".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 : |