Remove JavascriptMVC in the new web UI.

Update Apache config to point to v2 html.

Change-Id: Id60fb65c0452d9369d937f0a33baa3943f123cfe
This commit is contained in:
Weidong Shao 2014-08-07 05:05:31 +00:00
parent 3d367095f3
commit 832f10bbf1
2 changed files with 3 additions and 17 deletions

View File

@ -271,6 +271,7 @@ else
deactivate deactivate
fi fi
# TODO(xicheng): Please add comments to ths function. e.g, arg list
download() download()
{ {
url=$1 url=$1
@ -310,21 +311,9 @@ download()
echo "copy /tmp/$package to $destdir" echo "copy /tmp/$package to $destdir"
destdir=$4 destdir=$4
sudo cp /tmp/$package $destdir 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 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 # download cobbler related packages
centos_ppa_repo_packages=" centos_ppa_repo_packages="

View File

@ -8,12 +8,9 @@ WSGIScriptAlias /api /var/www/compass/compass.wsgi
WSGISocketPrefix /var/run/wsgi WSGISocketPrefix /var/run/wsgi
<VirtualHost *:80> <VirtualHost *:80>
DocumentRoot /var/www/compass_web DocumentRoot /var/www/compass_web/v2
RewriteRule ^/$ /ods/ods.html [R=301,L]
RewriteEngine on
RewriteRule ^/$ /ods/ods.html [R]
<Directory "/var/www/compass_web"> <Directory "/var/www/compass_web/v2">
Options Indexes FollowSymLinks Options Indexes FollowSymLinks
Order allow,deny Order allow,deny
Allow from all Allow from all