From: Herbert Eiselt <herbert.eiselt@highstreet-technologies.com>
Date: Tue, 20 Oct 2020 13:00:06 +0000 (+0000)
Subject: Merge "Fix error caused by empty env TOPOURL"
X-Git-Tag: 2.1.0~20
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=f7c28fb3379a4a0dc11d529c7e73d414d45d94dc;hp=e4592401768a9e8c04fbcdf817d21bf39f209405;p=sdnc%2Foam.git

Merge "Fix error caused by empty env TOPOURL"

Former-commit-id: eb77a8979a8f42ddb2dccb0da40dacd1c251abe0
---

diff --git a/installation/sdnc-web/src/main/docker/Dockerfile b/installation/sdnc-web/src/main/docker/Dockerfile
index e4c594b2..a552137f 100644
--- a/installation/sdnc-web/src/main/docker/Dockerfile
+++ b/installation/sdnc-web/src/main/docker/Dockerfile
@@ -21,7 +21,7 @@
 
 # Base bitnami nginx image
 FROM ${base.image.repo}
-MAINTAINER CCSDK Team (onap-ccsdk@lists.onap.org)
+LABEL maintainer="CCSDK Team (onap-ccsdk@lists.onap.org)"
 
 # copy ODLUX files to nginx
 COPY html /opt/bitnami/nginx/html  
@@ -38,6 +38,7 @@ ENV WEBPROTOCOL="HTTP" \
     TRPCEURL="" \
     TOPOURL="" \
     TILEURL="" \
+    DNS_RESOLVER="1.1.1.1" \
     SSL_CERT_DIR="/app/cert" \
     SSL_CERTIFICATE="cert.pem" \
     SSL_CERTIFICATE_KEY="cert.key"
diff --git a/installation/sdnc-web/src/main/resources/http_site.conf b/installation/sdnc-web/src/main/resources/http_site.conf
index d62fc8e7..53356b43 100644
--- a/installation/sdnc-web/src/main/resources/http_site.conf
+++ b/installation/sdnc-web/src/main/resources/http_site.conf
@@ -64,7 +64,7 @@ server {
         proxy_pass TOPOURL;
     }
     location ~ ^/tiles/  {
-        resolver 1.1.1.1;
+        resolver DNS_RESOLVER;
         if ($request_uri ~* "/tiles/(.*)") { 
             proxy_pass TILEURL/$1;
         }
diff --git a/installation/sdnc-web/src/main/resources/https_site.conf b/installation/sdnc-web/src/main/resources/https_site.conf
index d2d6ecd7..da86272d 100644
--- a/installation/sdnc-web/src/main/resources/https_site.conf
+++ b/installation/sdnc-web/src/main/resources/https_site.conf
@@ -83,7 +83,7 @@ server {
         proxy_pass TOPOURL;
     }
     location ~ ^/tiles/  {
-        resolver 1.1.1.1;
+        resolver DNS_RESOLVER;
         if ($request_uri ~* "/tiles/(.*)") { 
             proxy_pass TILEURL/$1;
         }
diff --git a/installation/sdnc-web/src/main/scripts/configure.sh b/installation/sdnc-web/src/main/scripts/configure.sh
index 2a007672..cf53a0d9 100644
--- a/installation/sdnc-web/src/main/scripts/configure.sh
+++ b/installation/sdnc-web/src/main/scripts/configure.sh
@@ -59,6 +59,7 @@ update_nginx_site_conf() {
     sed -i 's|SDNRPROTOCOL|'$SDNRPROTOCOL'|g' $FN
     sed -i 's|SDNRHOST|'$SDNRHOST'|g' $FN
     sed -i 's|SDNRPORT|'$SDNRPORT'|g' $FN
+    sed -i 's|DNS_RESOLVER|'$DNS_RESOLVER'|g' $FN
 
     # handle optional parameters
     if [ -z "$TRPCEURL" ]; then
@@ -70,7 +71,7 @@ update_nginx_site_conf() {
     fi
     if [ -z "$TOPOURL" ]; then
         echo "topology api forwarding disabled"
-        sed -i 's|proxy_pass TOPOURL/$1;|return 404;|g' $FN
+        sed -i 's|proxy_pass TOPOURL;|return 404;|g' $FN
     else
         sed -i 's|TOPOURL|'$TOPOURL'|g' $FN
     fi
diff --git a/installation/sdnc-web/src/main/scripts/run.sh b/installation/sdnc-web/src/main/scripts/run.sh
index f26934e5..c310837f 100644
--- a/installation/sdnc-web/src/main/scripts/run.sh
+++ b/installation/sdnc-web/src/main/scripts/run.sh
@@ -30,6 +30,7 @@ echo " WEBPORT      : $WEBPORT"
 echo " SDNRPROTOCOL : $SDNRPROTOCOL"
 echo " SDNRHOST     : $SDNRHOST"
 echo " SDNRPORT     : $SDNRPORT"
+echo " DNS_RESOLVER : $DNS_RESOLVER"
 echo " TRPCEURL     : $TRPCEURL"
 echo " TOPOURL      : $TOPOURL"
 echo " TILEURL      : $TILEURL"