From: Christophe Courtaut <christophe.courtaut@gmail.com>
Date: Mon, 16 Dec 2013 17:13:57 +0000 (+0100)
Subject: vstart: Update apache conf to run against apache 2.4
X-Git-Tag: v0.75~85^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F952%2Fhead;p=ceph.git

vstart: Update apache conf to run against apache 2.4

Signed-off-by: Christophe Courtaut <christophe.courtaut@gmail.com>
---

diff --git a/src/vstart.sh b/src/vstart.sh
index ae3002f73075..0a361bee24ae 100755
--- a/src/vstart.sh
+++ b/src/vstart.sh
@@ -536,10 +536,21 @@ $DAEMONOPTS
 EOF
 		    mkdir -p $CEPH_OUT_DIR/htdocs
 		    mkdir -p $CEPH_OUT_DIR/fastcgi_sock
+		    APACHE2_MODULE_PATH="/usr/lib/apache2/modules"
+		    APACHE2_EXTRA_MODULES_NAME="mpm_prefork authz_core"
+		    for module in $APACHE2_EXTRA_MODULES_NAME
+		    do
+			    if [ -f "${APACHE2_MODULE_PATH}/mod_${module}.so" ]; then
+				    APACHE2_EXTRA_MODULES="${APACHE2_EXTRA_MODULES}LoadModule ${module}_module ${APACHE2_MODULE_PATH}/mod_${module}.so
+"
+			    fi 
+		    done
+		    echo $APACHE2_EXTRA_MODULES
 		    cat <<EOF > $CEPH_OUT_DIR/apache.conf
 LoadModule env_module /usr/lib/apache2/modules/mod_env.so
 LoadModule rewrite_module /usr/lib/apache2/modules/mod_rewrite.so
 LoadModule fastcgi_module /usr/lib/apache2/modules/mod_fastcgi.so
+$APACHE2_EXTRA_MODULES
 
 Listen $rgwport
 ServerName rgwtest.example.com