From 832f10bbf161d1af1c295d07f69b1ef1f520035e Mon Sep 17 00:00:00 2001 From: Weidong Shao Date: Thu, 7 Aug 2014 05:05:31 +0000 Subject: [PATCH] Remove JavascriptMVC in the new web UI. Update Apache config to point to v2 html. Change-Id: Id60fb65c0452d9369d937f0a33baa3943f123cfe --- install/prepare.sh | 13 +------------ misc/apache/ods-server.conf | 7 ++----- 2 files changed, 3 insertions(+), 17 deletions(-) diff --git a/install/prepare.sh b/install/prepare.sh index ae244ba2..1c125d18 100755 --- a/install/prepare.sh +++ b/install/prepare.sh @@ -271,6 +271,7 @@ else deactivate fi +# TODO(xicheng): Please add comments to ths function. e.g, arg list download() { url=$1 @@ -310,21 +311,9 @@ download() echo "copy /tmp/$package to $destdir" destdir=$4 sudo cp /tmp/$package $destdir - elif [[ "$action" == "unzip" ]]; then - unzipped_package=${package%%.zip} - destdir=$4 - echo "unzip /tmp/$package to /tmp/$unzipped_package and copy to $destdir" - sudo rm -rf /tmp/$unzipped_package - pushd `pwd` - cd /tmp - sudo unzip -o /tmp/$package - popd - sudo cp -rf /tmp/$unzipped_package/. $destdir fi } -# download js mvc -download http://github.com/downloads/bitovi/javascriptmvc/$JS_MVC.zip $JS_MVC.zip unzip $WEB_HOME/public/ || exit $? # download cobbler related packages centos_ppa_repo_packages=" diff --git a/misc/apache/ods-server.conf b/misc/apache/ods-server.conf index 84890dde..5ff77907 100644 --- a/misc/apache/ods-server.conf +++ b/misc/apache/ods-server.conf @@ -8,12 +8,9 @@ WSGIScriptAlias /api /var/www/compass/compass.wsgi WSGISocketPrefix /var/run/wsgi - DocumentRoot /var/www/compass_web - RewriteRule ^/$ /ods/ods.html [R=301,L] - RewriteEngine on - RewriteRule ^/$ /ods/ods.html [R] + DocumentRoot /var/www/compass_web/v2 - + Options Indexes FollowSymLinks Order allow,deny Allow from all