development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-28 03:59:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'sk/instaweb-rh-update'

Browse source 
"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
This commit is contained in:
Junio C Hamano 2018-08-20 11:33:49 -07:00
parent 02c51a2fd8 757b12494b
commit 93ded333bc
1 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
git-instaweb.sh
View file

@ -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