diff options
| author | Mark Rada <marada@uwaterloo.ca> | 2009-09-26 14:12:32 -0400 |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2009-09-29 10:06:52 -0700 |
| commit | 10d1432aece21ac65a89fe962b1c3019ec1f46e0 (patch) | |
| tree | 156321568c428883bbcc6c13a0f46342e7252c1b | |
| parent | 1be224ba6e99f0ab34c998d7fa8023b76a15c8b6 (diff) | |
| download | git-10d1432aece21ac65a89fe962b1c3019ec1f46e0.tar.gz | |
instaweb: support mod_cgid for apache2
Some people have mod_cgid instead of mod_cgi, most likely as a result of
choosing a threaded MPM.
In cases where the user has both modules, mod_cgi will be preferred in
order to maintain a simpler setup.
This patch also causes instaweb to print a message and die in cases
where there is no module that instaweb knows how to handle.
Signed-off-by: Mark Rada <marada@uwaterloo.ca>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
| -rwxr-xr-x | git-instaweb.sh | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/git-instaweb.sh b/git-instaweb.sh index d96eddbe56..622a5f0eb2 100755 --- a/git-instaweb.sh +++ b/git-instaweb.sh @@ -317,7 +317,21 @@ EOF resolve_full_httpd list_mods=$(echo "$full_httpd" | sed "s/-f$/-l/") $list_mods | grep 'mod_cgi\.c' >/dev/null 2>&1 || \ - echo "LoadModule cgi_module $module_path/mod_cgi.so" >> "$conf" + if test -f "$module_path/mod_cgi.so" + then + echo "LoadModule cgi_module $module_path/mod_cgi.so" >> "$conf" + else + $list_mods | grep 'mod_cgid\.c' >/dev/null 2>&1 || \ + if test -f "$module_path/mod_cgid.so" + then + echo "LoadModule cgid_module $module_path/mod_cgid.so" \ + >> "$conf" + else + echo "You have no CGI support!" + exit 2 + fi + echo "ScriptSock logs/gitweb.sock" >> "$conf" + fi cat >> "$conf" <<EOF AddHandler cgi-script .cgi <Location /gitweb.cgi> |