commit 6274dca6c5f29cc16e9014eed71a8f7d60106e7c
author Matteo Scandolo <matteo.scandolo@gmail.com> Mon Apr 24 11:23:44 2017 -0700
committer Matteo Scandolo <teo@onlab.us> Wed Apr 26 13:58:08 2017 -0700
tree 49c74c0fc3facc13b2ae476e6dcd79a5af54989e
parent 0d1015d24e0ab40228f7be7f450786ba9fc79d4c

[CORD-1140]
updated proxy to use the new UI as default

Change-Id: I56a561ba564d5bfa76edc769e60ee5ffc340c638
(cherry picked from commit dd38a6355020d098725eace46b4e842d466973c5)

roles/apache-proxy/files/cord-http.conf

diff --git a/roles/apache-proxy/files/cord-http.conf b/roles/apache-proxy/files/cord-http.conf
index 2feb788..b205dfc 100644
--- a/roles/apache-proxy/files/cord-http.conf
+++ b/roles/apache-proxy/files/cord-http.conf
@@ -32,9 +32,9 @@
         ProxyPass "ws://onos-cord:8182/onos/ui/websock/" disablereuse=on
     </Location>
 
-    # Cord SPA and rest-gw
-    ProxyPass /spa http://xos-gui:4000
-    ProxyPass /spa/socket.io http://xos-ws:3000/socket.io
+    # Cord GUI and WS
+    ProxyPass /xos http://xos-gui:4000
+    ProxyPass /xos/socket.io http://xos-ws:3000/socket.io
     ProxyPass /socket.io http://xos-ws:3000/socket.io
     <Location /socket.io>
         RewriteEngine on
@@ -44,8 +44,8 @@
     </Location>
     
     # Map the various XOS roots to the XOS instance
-    ProxyPass /xos http://xos:9000
-    ProxyPass /xos/ http://xos:9000/
+    ProxyPass /xos-deprecated http://xos:9000
+    ProxyPass /xos-deprecated/ http://xos:9000/
     ProxyPassMatch /(api)$ http://xos:9000/$1/
     ProxyPass /api/ http://xos:9000/api/
     ProxyPass /login http://xos:9000/login
@@ -54,6 +54,7 @@
     ProxyPass /loggedin/ http://xos:9000/loggedin/
     ProxyPass /serviceGrid/ http://xos:9000/serviceGrid/
 
+    # Rest APIs
     ProxyPass /xosapi/ http://xos-chameleon:9101/xosapi/
 </IfModule>