git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Sebastian Kisela <skisela@redhat.com>
To: git@vger.kernel.org
Cc: skisela@redhat.com
Subject: [PATCH 1/2] git-instaweb: support Fedora/Red Hat apache module path
Date: Wed,  8 Aug 2018 10:49:18 +0200	[thread overview]
Message-ID: <20180808084918.3424-2-skisela@redhat.com> (raw)
In-Reply-To: <20180808084918.3424-1-skisela@redhat.com>

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>
---
 git-instaweb.sh | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/git-instaweb.sh b/git-instaweb.sh
index 47e38f34c..675add184 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"
-- 
2.14.4


      reply	other threads:[~2018-08-08  8:51 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-08-07  7:25 [PATCH 1/2] git-instaweb: support Fedora/Red Hat apache module path Sebastian Kisela
2018-08-07  7:25 ` [PATCH 2/2] git-instaweb: fix apache2 config with apache >= 2.4 Sebastian Kisela
2018-08-07 21:25 ` [PATCH 1/2] git-instaweb: support Fedora/Red Hat apache module path Junio C Hamano
2018-08-07 22:11   ` Junio C Hamano
2018-08-08  8:49     ` Sebastian Kisela
2018-08-08  8:49       ` Sebastian Kisela [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180808084918.3424-2-skisela@redhat.com \
    --to=skisela@redhat.com \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).