# HG changeset patch # User Christopher Rogers # Date 1310383635 0 # Node ID 828711dd2cc6eaa2e2b84f5f282ab860d8e468cd # Parent 84764c5713d01845bbf5cc170a17d3967d4d6083 Updated lighttpd configs. diff -r 84764c5713d0 -r 828711dd2cc6 initramfs/etc/lighttpd/vhosts-local-tank.conf --- a/initramfs/etc/lighttpd/vhosts-local-tank.conf Wed Jun 29 01:12:25 2011 +0000 +++ b/initramfs/etc/lighttpd/vhosts-local-tank.conf Mon Jul 11 11:27:15 2011 +0000 @@ -28,18 +28,10 @@ accesslog.filename = "/var/log/lighttpd/slitaz.org-access.log" include "awstats.conf" - index-file.names += ( "index.php" ) - index-file.names += ( "index.html" ) - - url.rewrite-once = ( - "^/about" => "/fr/about", - "^/artwork" => "/fr/artwork", - "^/devel" => "/fr/devel", - "^/doc" => "/fr/doc", - "^/get" => "/fr/get", - "^/packages" => "/fr/packages" + index-file.names += ( "index.cgi", "index.php", "index.html" ) + cgi.assign = ( + ".cgi" => "/bin/sh" ) - } # pro.slitaz.org @@ -72,6 +64,9 @@ server.document-root = "/home/slitaz/www/boot" server.errorlog = "/var/log/lighttpd/boot.slitaz.org-error.log" accesslog.filename = "/var/log/lighttpd/boot.slitaz.org-access.log" + cgi.assign = ( + ".cgi" => "/bin/sh" + ) } # pkgs.slitaz.org @@ -93,16 +88,6 @@ accesslog.filename = "/var/log/lighttpd/bb.slitaz.org-access.log" } -# cook.slitaz.org -# -$HTTP["host"] =~ "cook\.slitaz\.org$" { - cgi.assign = ( - ".cgi" => "/bin/sh" - ) - index-file.names = ( "cooker.cgi" ) - server.document-root = "/home/slitaz/www/cook" -} - # hg.slitaz.org (Mercurial repos) # $HTTP["host"] =~ "hg\.slitaz\.org" { @@ -111,6 +96,16 @@ ) server.document-root = "/home/slitaz/www/hg" url.rewrite-once = ( "(.*)" => "/hgwebdir.cgi$1" ) + auth.backend = "plain" + auth.backend.plain.userfile = "/etc/lighttpd/plain.passwd" + $HTTP["querystring"] =~ "cmd=unbundle" { + auth.require = ( "" => ( + "method" => "basic", + "realm" => "SliTaz Mercurial repositories protected area", + "require" => "vaild-user" + ) + ) + } } # repos.slitaz.org (Mercurial repos with auth and write access) @@ -192,6 +187,16 @@ ) } +# cook.slitaz.org +# +$HTTP["host"] =~ "cook\.slitaz\.org$" { + cgi.assign = ( + ".cgi" => "/bin/sh" + ) + index-file.names = ( "cooker.cgi" ) + server.document-root = "/home/slitaz/www/cook" +} + # ssfs.slitaz.org # $HTTP["host"] =~ "ssfs\.slitaz\.org$" { diff -r 84764c5713d0 -r 828711dd2cc6 initramfs/etc/lighttpd/vhosts-tank.conf --- a/initramfs/etc/lighttpd/vhosts-tank.conf Wed Jun 29 01:12:25 2011 +0000 +++ b/initramfs/etc/lighttpd/vhosts-tank.conf Mon Jul 11 11:27:15 2011 +0000 @@ -28,18 +28,10 @@ accesslog.filename = "/var/log/lighttpd/slitaz.org-access.log" include "awstats.conf" - index-file.names += ( "index.php" ) - index-file.names += ( "index.html" ) - - url.rewrite-once = ( - "^/about" => "/fr/about", - "^/artwork" => "/fr/artwork", - "^/devel" => "/fr/devel", - "^/doc" => "/fr/doc", - "^/get" => "/fr/get", - "^/packages" => "/fr/packages" + index-file.names += ( "index.cgi", "index.php", "index.html" ) + cgi.assign = ( + ".cgi" => "/bin/sh" ) - } # pro.slitaz.org