Merge "Set DocumentRoot for devstack plugin"

This commit is contained in:
Jenkins 2015-07-14 19:56:31 +00:00 committed by Gerrit Code Review
commit 34d141c81d
3 changed files with 6 additions and 0 deletions

View File

@ -1,5 +1,7 @@
Listen %PORT%
<VirtualHost *:%PORT%>
DocumentRoot %OS_LOGANALYZE_APACHE_DOCUMENTROOT%
# use Apache to compress the results afterwards, to save on the wire
# it's approx 18x savings of wire traffic to compress. We need to
# compress by content types that htmlify can produce

View File

@ -36,6 +36,8 @@ if is_service_enabled os_loganalyze; then
# Perform installation of service source
echo_summary "Installing os_loganalyze"
setup_install $OS_LOGANALYZE_DIR
sudo mkdir -p $OS_LOGANALYZE_APACHE_DOCUMENTROOT
sudo chown www-data:www-data $OS_LOGANALYZE_APACHE_DOCUMENTROOT
elif [[ "$1" == "stack" && "$2" == "post-config" ]]; then
# Configure after the other layer 1 and 2 services have been configured
@ -45,6 +47,7 @@ if is_service_enabled os_loganalyze; then
sudo sed -e "
s/%PORT%/8080/g;
s/%OS_LOGANALYZE_DIR%/${OS_LOGANALYZE_DIR//\//\\\/}/g;
s/%OS_LOGANALYZE_APACHE_DOCUMENTROOT%/${OS_LOGANALYZE_APACHE_DOCUMENTROOT//\//\\\/}/g;
" -i $(apache_site_config_for os_loganalyze)
enable_apache_site os_loganalyze

View File

@ -1,4 +1,5 @@
OS_LOGANALYZE_DIR=$DEST/os-loganalyze
OS_LOGANALYZE_APACHE_TEMPLATE=$OS_LOGANALYZE_DIR/devstack/os-loganalyze.template
OS_LOGANALYZE_APACHE_DOCUMENTROOT=/var/www/logs
enable_service os_loganalyze