summaryrefslogtreecommitdiffstats
path: root/reporting
diff options
context:
space:
mode:
authorchenjiankun <chenjiankun1@huawei.com>2017-09-11 06:24:45 +0000
committerchenjiankun <chenjiankun1@huawei.com>2017-09-11 06:24:45 +0000
commitd6a91e242d2cd5ba1c1cb4e15d843310fc5347b7 (patch)
tree5a7eb47fba7cce9c87f0a6e9b20b194f95492d14 /reporting
parentf09f42bc881f9de8f20646fb30a480054986b108 (diff)
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>
Diffstat (limited to 'reporting')
-rw-r--r--reporting/docker/nginx.conf6
-rwxr-xr-xreporting/pages/config.sh2
2 files changed, 4 insertions, 4 deletions
diff --git a/reporting/docker/nginx.conf b/reporting/docker/nginx.conf
index ced8179..95baf0e 100644
--- a/reporting/docker/nginx.conf
+++ b/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/reporting/pages/config.sh b/reporting/pages/config.sh
index f9bb89a..62aa16f 100755
--- a/reporting/pages/config.sh
+++ b/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