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
SDNRPROTOCOL="HTTP" \
SDNRHOST="172.18.0.3" \
SDNRPORT="8181" \
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"
SSL_CERT_DIR="/app/cert" \
SSL_CERTIFICATE="cert.pem" \
SSL_CERTIFICATE_KEY="cert.key"
- set $sdnrserver "SDNRHOST";
-
location ~ ^/$ {
return 301 /odlux/index.html;
}
location ~ ^/$ {
return 301 /odlux/index.html;
}
try_files $uri $uri/ @backend;
}
location /websocket {
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 {
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;
- set $sdnrserver "SDNRHOST";
-
location ~ ^/$ {
return 301 /odlux/index.html;
}
location ~ ^/$ {
return 301 /odlux/index.html;
}
try_files $uri $uri/ @backend;
}
location /websocket {
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 {
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;
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|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
#cp /opt/bitnami/nginx/sbin/https_site.conf /opt/bitnami/nginx/conf/server_blocks
rm /opt/bitnami/nginx/conf/server_blocks/http_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|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
#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
echo " SDNRPROTOCOL: $SDNRPROTOCOL"
echo " SDNRHOST: $SDNRHOST"
echo " SDNRPORT: $SDNRPORT"
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
echo " SSL_CERT_DIR: $SSL_CERT_DIR"
echo -n " SSL_CERTIFICATE: $SSL_CERTIFICATE"
if [ -f "$SSL_CERTIFICATE" ]; then
fi
# Call the base images' run.sh to start NGINX
fi
# Call the base images' run.sh to start NGINX
-bash /run.sh
\ No newline at end of file