From: Morgan Richomme <morgan.richomme@orange.com>
Date: Mon, 11 Sep 2017 08:29:57 +0000 (+0000)
Subject: Merge "Change nginx configuration"
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=b584f4d1b522b2dc62b664c5dca33e121a2efab2;hp=c4dbd3450cb914c2b1e6bf4ba66a220082cfec09;p=releng.git

Merge "Change nginx configuration"
---

diff --git a/utils/test/reporting/docker/nginx.conf b/utils/test/reporting/docker/nginx.conf
index ced8179c1..95baf0e48 100644
--- a/utils/test/reporting/docker/nginx.conf
+++ b/utils/test/reporting/docker/nginx.conf
@@ -11,11 +11,11 @@ server {
     server_name localhost;
 
     location / {
-        proxy_pass http://backends;
+        alias /home/opnfv/releng/utils/test/reporting/pages/dist/;
     }
 
-    location /reporting/ {
-        alias /home/opnfv/releng/utils/test/reporting/pages/dist/;
+    location /api/ {
+        http_pass http://backends/;
     }
 
     location /display/ {
diff --git a/utils/test/reporting/pages/config.sh b/utils/test/reporting/pages/config.sh
index f9bb89ac8..62aa16f1c 100755
--- a/utils/test/reporting/pages/config.sh
+++ b/utils/test/reporting/pages/config.sh
@@ -1,3 +1,3 @@
-: ${SERVER_URL:='testresults.opnfv.org/reporting2'}
+: ${SERVER_URL:='testresults.opnfv.org/testing/api'}
 
 echo "{\"url\": \"http://${SERVER_URL}\"}" > dist/config.json