From 1976311aa285549599e5a451d7ad72b55a2b60e2 Mon Sep 17 00:00:00 2001 From: Sebastian Kisela Date: Wed, 8 Aug 2018 10:49:18 +0200 Subject: [PATCH 1/2] 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 and Junio C Hamano . Signed-off-by: Sebastian Kisela Signed-off-by: Junio C Hamano --- git-instaweb.sh | 18 +++++++++++------- 1 file 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" From 757b12494bd3e4c6cbc2fd081d60ed41b60208ae Mon Sep 17 00:00:00 2001 From: Sebastian Kisela Date: Tue, 7 Aug 2018 09:25:48 +0200 Subject: [PATCH 2/2] git-instaweb: fix apache2 config with apache >= 2.4 The generated apache2 config fails with apache >= 2.4. The error log states: AH00136: Server MUST relinquish startup privileges before accepting connections. Please ensure mod_unixd or other system security module is loaded. AH00016: Configuration Failed Fix this by loading the unixd module. This works with older httpd as well, so no IfVersion conditional is needed. (Tested with httpd-2.2.15 on CentOS-6.) Written with assistance of Todd Zullinger Signed-off-by: Sebastian Kisela Signed-off-by: Junio C Hamano --- git-instaweb.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-instaweb.sh b/git-instaweb.sh index 675add1842..eec264e630 100755 --- a/git-instaweb.sh +++ b/git-instaweb.sh @@ -360,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