diff options
| author | Sebastian Kisela <skisela@redhat.com> | 2018-08-08 10:49:18 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-08-08 17:29:45 +0200 |
| commit | 1976311aa285549599e5a451d7ad72b55a2b60e2 (patch) | |
| tree | 9e58cce9e676d89f123c84eb5674683671d56eff /git-instaweb.sh | |
| parent | Fifth batch for 2.19 cycle (diff) | |
| download | git-1976311aa285549599e5a451d7ad72b55a2b60e2.tar.xz git-1976311aa285549599e5a451d7ad72b55a2b60e2.zip | |
git-instaweb: support Fedora/Red Hat apache module path
On Fedora-derived systems, the apache httpd package installs modules
under /usr/lib{,64}/httpd/modules, depending on whether the system is
32- or 64-bit. A symlink from /etc/httpd/modules is created which
points to the proper module path. Use it to support apache on Fedora,
CentOS, and Red Hat systems.
Written with assistance of Todd Zullinger <tmz@pobox.com> and
Junio C Hamano <gitster@pobox.com>.
Signed-off-by: Sebastian Kisela <skisela@redhat.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-instaweb.sh')
| -rwxr-xr-x | git-instaweb.sh | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/git-instaweb.sh b/git-instaweb.sh index 47e38f34c3..675add1842 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" |