From: chenjiankun <chenjiankun1@huawei.com>
Date: Mon, 11 Sep 2017 06:24:45 +0000 (+0000)
Subject: Change nginx configuration
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=f53cb19a64711f600a562242222b6e52a974d956;p=releng.git

Change nginx configuration

Since landing page have changed from reporting2 to testing,
the nginx configuration need some adoption.

If the pre url change again, we need to config the base_url when start
our docker container. For example:
    docker run -itd -p 8084:8000 -e SERVER_URL testresults.opnfv.org/xxx/api opnfv/reporting:latest

Change-Id: If3c9f9af76fcfc8047b5b9559fcc8bd45740d4d2
Signed-off-by: chenjiankun <chenjiankun1@huawei.com>
---

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