diff options
Diffstat (limited to 'git-instaweb.sh')
-rwxr-xr-x | git-instaweb.sh | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/git-instaweb.sh b/git-instaweb.sh index 16cd351f7f..80adc8307b 100755 --- a/git-instaweb.sh +++ b/git-instaweb.sh @@ -53,6 +53,9 @@ start_httpd () { return fi done + echo "$httpd_only not found. Install $httpd_only or use" \ + "--httpd to specify another http daemon." + exit 1 fi if test $? != 0; then echo "Could not execute http daemon $httpd." @@ -160,10 +163,20 @@ apache2_conf () { test "$local" = true && bind='127.0.0.1:' echo 'text/css css' > $fqgitdir/mime.types cat > "$conf" <<EOF +ServerName "git-instaweb" ServerRoot "$fqgitdir/gitweb" DocumentRoot "$fqgitdir/gitweb" PidFile "$fqgitdir/pid" Listen $bind$port +EOF + + for mod in mime dir; do + if test -e $module_path/mod_${mod}.so; then + echo "LoadModule ${mod}_module " \ + "$module_path/mod_${mod}.so" >> "$conf" + fi + done + cat >> "$conf" <<EOF TypesConfig $fqgitdir/mime.types DirectoryIndex gitweb.cgi EOF |