]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
vstart: Update apache conf to run against apache 2.4 952/head
authorChristophe Courtaut <christophe.courtaut@gmail.com>
Mon, 16 Dec 2013 17:13:57 +0000 (18:13 +0100)
committerChristophe Courtaut <christophe.courtaut@gmail.com>
Wed, 18 Dec 2013 14:54:53 +0000 (15:54 +0100)
Signed-off-by: Christophe Courtaut <christophe.courtaut@gmail.com>
src/vstart.sh

index ae3002f7307569aae9a8947d0faf67e6aeda0c32..0a361bee24ae7eafa326c97e083dfc7b759f1c16 100755 (executable)
@@ -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