|
 |
6743a1 |
From aebe9c096f7150eee901fcc59036a89c54c26a0b Mon Sep 17 00:00:00 2001
|
|
|
6743a1 |
From: Sebastian Kisela <skisela@redhat.com>
|
|
|
6743a1 |
Date: Mon, 16 Jul 2018 08:54:00 +0200
|
|
|
6743a1 |
Subject: [PATCH] Switch instaweb default HTTP daemon to httpd
|
|
|
6743a1 |
|
|
|
6743a1 |
---
|
|
|
6743a1 |
git-instaweb.sh | 6 ++++--
|
|
|
6743a1 |
1 file changed, 4 insertions(+), 2 deletions(-)
|
|
|
6743a1 |
|
|
|
6743a1 |
diff --git a/git-instaweb.sh b/git-instaweb.sh
|
|
|
6743a1 |
index 47e38f3..e089f0d 100755
|
|
|
6743a1 |
--- a/git-instaweb.sh
|
|
|
6743a1 |
+++ b/git-instaweb.sh
|
|
|
6743a1 |
@@ -36,7 +36,7 @@ conf="$GIT_DIR/gitweb/httpd.conf"
|
|
|
6743a1 |
# Defaults:
|
|
|
6743a1 |
|
|
|
6743a1 |
# if installed, it doesn't need further configuration (module_path)
|
|
|
6743a1 |
-test -z "$httpd" && httpd='lighttpd -f'
|
|
|
6743a1 |
+test -z "$httpd" && httpd='httpd -f'
|
|
|
6743a1 |
|
|
|
6743a1 |
# Default is @@GITWEBDIR@@
|
|
|
6743a1 |
test -z "$root" && root='@@GITWEBDIR@@'
|
|
|
6743a1 |
@@ -332,6 +332,8 @@ apache2_conf () {
|
|
|
6743a1 |
module_path="/usr/lib/httpd/modules"
|
|
|
6743a1 |
test -d "/usr/lib/apache2/modules" &&
|
|
|
6743a1 |
module_path="/usr/lib/apache2/modules"
|
|
|
6743a1 |
+ test -d "/etc/httpd/modules" &&
|
|
|
6743a1 |
+ module_path="/etc/httpd/modules"
|
|
|
6743a1 |
fi
|
|
|
6743a1 |
bind=
|
|
|
6743a1 |
test x"$local" = xtrue && bind='127.0.0.1:'
|
|
|
6743a1 |
@@ -356,7 +358,7 @@ EOF
|
|
|
6743a1 |
break
|
|
|
6743a1 |
fi
|
|
|
6743a1 |
done
|
|
|
6743a1 |
- for mod in mime dir env log_config authz_core
|
|
|
6743a1 |
+ for mod in mime dir env log_config authz_core unixd
|
|
|
6743a1 |
do
|
|
|
6743a1 |
if test -e $module_path/mod_${mod}.so
|
|
|
6743a1 |
then
|
|
|
6743a1 |
--
|
|
|
6743a1 |
2.14.4
|
|
|
6743a1 |
|