diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-08-20 11:33:49 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-08-20 11:33:49 -0700 |
| commit | 93ded333bcb6687bc2aee533f18e5a0ea718024a (patch) | |
| tree | b9bbdbf0d7b03a449d6dc20d2e4114e69cbe4ba1 | |
| parent | Merge branch 'en/t7406-fixes' (diff) | |
| parent | git-instaweb: fix apache2 config with apache >= 2.4 (diff) | |
| download | tgif-93ded333bcb6687bc2aee533f18e5a0ea718024a.tar.xz | |
Merge branch 'sk/instaweb-rh-update'
"git instaweb" has been adjusted to run better with newer Apache on
RedHat based distros.
* sk/instaweb-rh-update:
git-instaweb: fix apache2 config with apache >= 2.4
git-instaweb: support Fedora/Red Hat apache module path
| -rwxr-xr-x | git-instaweb.sh | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/git-instaweb.sh b/git-instaweb.sh index 47e38f34c3..eec264e630 100755 --- a/git-instaweb.sh +++ b/git-instaweb.sh @@ -326,13 +326,17 @@ EOF } apache2_conf () { - if test -z "$module_path" - then - test -d "/usr/lib/httpd/modules" && - module_path="/usr/lib/httpd/modules" - test -d "/usr/lib/apache2/modules" && - module_path="/usr/lib/apache2/modules" - fi + for candidate in \ + /etc/httpd \ + /usr/lib/apache2 \ + /usr/lib/httpd ; + do + if test -d "$candidate/modules" + then + module_path="$candidate/modules" + break + fi + done bind= test x"$local" = xtrue && bind='127.0.0.1:' echo 'text/css css' > "$fqgitdir/mime.types" @@ -356,7 +360,7 @@ EOF break fi done - for mod in mime dir env log_config authz_core + for mod in mime dir env log_config authz_core unixd do if test -e $module_path/mod_${mod}.so then |