git-instaweb: fix lighttpd configuration on cygwin
Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk> Tested-by: Pascal Obry <pascal@obry.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
4d5d398474
commit
e47eec8fc6
@ -49,7 +49,7 @@ resolve_full_httpd () {
|
|||||||
esac
|
esac
|
||||||
|
|
||||||
httpd_only="$(echo $httpd | cut -f1 -d' ')"
|
httpd_only="$(echo $httpd | cut -f1 -d' ')"
|
||||||
if case "$httpd_only" in /*) : ;; *) which $httpd_only >/dev/null;; esac
|
if case "$httpd_only" in /*) : ;; *) which $httpd_only >/dev/null 2>&1;; esac
|
||||||
then
|
then
|
||||||
full_httpd=$httpd
|
full_httpd=$httpd
|
||||||
else
|
else
|
||||||
@ -179,11 +179,74 @@ lighttpd_conf () {
|
|||||||
cat > "$conf" <<EOF
|
cat > "$conf" <<EOF
|
||||||
server.document-root = "$fqgitdir/gitweb"
|
server.document-root = "$fqgitdir/gitweb"
|
||||||
server.port = $port
|
server.port = $port
|
||||||
server.modules = ( "mod_cgi" )
|
server.modules = ( "mod_setenv", "mod_cgi" )
|
||||||
server.indexfiles = ( "gitweb.cgi" )
|
server.indexfiles = ( "gitweb.cgi" )
|
||||||
server.pid-file = "$fqgitdir/pid"
|
server.pid-file = "$fqgitdir/pid"
|
||||||
|
server.errorlog = "$fqgitdir/gitweb/error.log"
|
||||||
|
|
||||||
|
# to enable, add "mod_access", "mod_accesslog" to server.modules
|
||||||
|
# variable above and uncomment this
|
||||||
|
#accesslog.filename = "$fqgitdir/gitweb/access.log"
|
||||||
|
|
||||||
|
setenv.add-environment = ( "PATH" => "/usr/local/bin:/usr/bin:/bin" )
|
||||||
|
|
||||||
cgi.assign = ( ".cgi" => "" )
|
cgi.assign = ( ".cgi" => "" )
|
||||||
mimetype.assign = ( ".css" => "text/css" )
|
|
||||||
|
# mimetype mapping
|
||||||
|
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",
|
||||||
|
".cpp" => "text/plain",
|
||||||
|
".log" => "text/plain",
|
||||||
|
".conf" => "text/plain",
|
||||||
|
".text" => "text/plain",
|
||||||
|
".txt" => "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",
|
||||||
|
"" => "text/plain"
|
||||||
|
)
|
||||||
EOF
|
EOF
|
||||||
test x"$local" = xtrue && echo 'server.bind = "127.0.0.1"' >> "$conf"
|
test x"$local" = xtrue && echo 'server.bind = "127.0.0.1"' >> "$conf"
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user