Use system DNS resolver

Use system DNS resolver instead of the nginx DNS resolver

Issue-ID: SDNC-1247
Signed-off-by: Ravi Pendurty <ravi.pendurty@highstreet-technologies.com>
Change-Id: Iff3b82fc540a7271ee3e87ddd21f939ca6fdad17

Former-commit-id: 777395dad47d25403317639684f3591f844dc57b

diff --git a/installation/sdnc-web/src/main/docker/Dockerfile b/installation/sdnc-web/src/main/docker/Dockerfile
index 37de716..5009a21 100644 (file)
--- a/installation/sdnc-web/src/main/docker/Dockerfile
+++ b/installation/sdnc-web/src/main/docker/Dockerfile
@@ -36,7 +36,6 @@ ENV WEBPROTOCOL="HTTP" \
        SDNRPROTOCOL="HTTP" \
        SDNRHOST="172.18.0.3" \
        SDNRPORT="8181" \
-       LOCALDNS="127.0.0.11" \
        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 dd64141..640668a 100644 (file)
--- a/installation/sdnc-web/src/main/resources/http_site.conf
+++ b/installation/sdnc-web/src/main/resources/http_site.conf
@@ -49,8 +49,6 @@ server {
 
        server_name _;
 
-       set $sdnrserver "SDNRHOST";
-
        location ~ ^/$  {
                return 301 /odlux/index.html;
        }
@@ -61,15 +59,13 @@ server {
                try_files $uri $uri/ @backend;
        }
        location /websocket {
-           resolver LOCALDNS;
-               proxy_pass SDNRPROTOCOL://$sdnrserver:SDNRPORT/websocket;
+               proxy_pass SDNRPROTOCOL://SDNRHOST:SDNRPORT/websocket;
                proxy_http_version 1.1;
                proxy_set_header Upgrade $http_upgrade;
                proxy_set_header Connection "upgrade";
        }
        location @backend {
-           resolver LOCALDNS;
-               proxy_pass SDNRPROTOCOL://$sdnrserver:SDNRPORT;
+               proxy_pass SDNRPROTOCOL://SDNRHOST:SDNRPORT;
        }
 
 }

diff --git a/installation/sdnc-web/src/main/resources/https_site.conf b/installation/sdnc-web/src/main/resources/https_site.conf
index 49afa07..5dc4cfb 100644 (file)
--- a/installation/sdnc-web/src/main/resources/https_site.conf
+++ b/installation/sdnc-web/src/main/resources/https_site.conf
@@ -68,8 +68,6 @@ server {
 
        server_name _;
 
-       set $sdnrserver "SDNRHOST";
-
        location ~ ^/$  {
                return 301 /odlux/index.html;
        }
@@ -80,15 +78,13 @@ server {
                try_files $uri $uri/ @backend;
        }
        location /websocket {
-           resolver LOCALDNS;
-               proxy_pass SDNRPROTOCOL://$sdnrserver:SDNRPORT/websocket;
+               proxy_pass SDNRPROTOCOL://SDNRHOST:SDNRPORT/websocket;
                proxy_http_version 1.1;
                proxy_set_header Upgrade $http_upgrade;
                proxy_set_header Connection "upgrade";
        }
        location @backend {
-           resolver LOCALDNS;
-               proxy_pass SDNRPROTOCOL://$sdnrserver:SDNRPORT;
+               proxy_pass SDNRPROTOCOL://SDNRHOST:SDNRPORT;
        }
 
 }

diff --git a/installation/sdnc-web/src/main/scripts/configure.sh b/installation/sdnc-web/src/main/scripts/configure.sh
index b8385fd..ca2ea76 100644 (file)
--- a/installation/sdnc-web/src/main/scripts/configure.sh
+++ b/installation/sdnc-web/src/main/scripts/configure.sh
@@ -44,7 +44,6 @@ update_nginx_site_conf() {
                sed -i 's|SDNRPROTOCOL|'$SDNRPROTOCOL'|g' /opt/bitnami/nginx/conf/server_blocks/https_site.conf
                sed -i 's|SDNRHOST|'$SDNRHOST'|g' /opt/bitnami/nginx/conf/server_blocks/https_site.conf
                sed -i 's|SDNRPORT|'$SDNRPORT'|g' /opt/bitnami/nginx/conf/server_blocks/https_site.conf
-               sed -i 's|LOCALDNS|'$LOCALDNS'|g' /opt/bitnami/nginx/conf/server_blocks/https_site.conf
                
                #cp /opt/bitnami/nginx/sbin/https_site.conf /opt/bitnami/nginx/conf/server_blocks
                rm /opt/bitnami/nginx/conf/server_blocks/http_site.conf
@@ -54,7 +53,6 @@ update_nginx_site_conf() {
                sed -i 's|SDNRPROTOCOL|'$SDNRPROTOCOL'|g' /opt/bitnami/nginx/conf/server_blocks/http_site.conf
                sed -i 's|SDNRHOST|'$SDNRHOST'|g' /opt/bitnami/nginx/conf/server_blocks/http_site.conf
                sed -i 's|SDNRPORT|'$SDNRPORT'|g' /opt/bitnami/nginx/conf/server_blocks/http_site.conf
-               sed -i 's|LOCALDNS|'$LOCALDNS'|g' /opt/bitnami/nginx/conf/server_blocks/http_site.conf
                #cp /opt/bitnami/nginx/sbin/http_site.conf /opt/bitnami/nginx/conf/server_blocks
                rm /opt/bitnami/nginx/conf/server_blocks/https_site.conf
        fi

diff --git a/installation/sdnc-web/src/main/scripts/run.sh b/installation/sdnc-web/src/main/scripts/run.sh
index 544dd47..604ebde 100644 (file)
--- a/installation/sdnc-web/src/main/scripts/run.sh
+++ b/installation/sdnc-web/src/main/scripts/run.sh
@@ -30,7 +30,6 @@ echo " WEBPORT: $WEBPORT"
 echo " SDNRPROTOCOL: $SDNRPROTOCOL"
 echo " SDNRHOST: $SDNRHOST"
 echo " SDNRPORT: $SDNRPORT"
-echo " LOCALDNS: $LOCALDNS"
 echo " SSL_CERT_DIR: $SSL_CERT_DIR"
 echo -n " SSL_CERTIFICATE: $SSL_CERTIFICATE"
 if [ -f "$SSL_CERTIFICATE" ]; then
@@ -66,4 +65,4 @@ if [ ! -z "$DEBUG" ]; then
 fi
 
 # Call the base images' run.sh to start NGINX
-bash /run.sh
\ No newline at end of file
+bash /run.sh