Various boot scripts should have been checking for "no_proxy"
but were checking for " " instead. This fixes the issue.
Also add default values for HTTP_PROXY variables.
Change-Id: I5245018a7bb9c33b84ac3096d8a9c0986b2e976c
Issue-ID: OOM-1275
Signed-off-by: gwu <gary.i.wu@huawei.com>
21 files changed:
HTTP_PROXY=$(cat /opt/config/http_proxy.txt)
HTTPS_PROXY=$(cat /opt/config/https_proxy.txt)
HTTP_PROXY=$(cat /opt/config/http_proxy.txt)
HTTPS_PROXY=$(cat /opt/config/https_proxy.txt)
-if [ $HTTP_PROXY != " " ]
+if [ $HTTP_PROXY != "no_proxy" ]
then
export http_proxy=$HTTP_PROXY
export https_proxy=$HTTPS_PROXY
then
export http_proxy=$HTTP_PROXY
export https_proxy=$HTTPS_PROXY
HTTP_PROXY=$(cat /opt/config/http_proxy.txt)
HTTPS_PROXY=$(cat /opt/config/https_proxy.txt)
HTTP_PROXY=$(cat /opt/config/http_proxy.txt)
HTTPS_PROXY=$(cat /opt/config/https_proxy.txt)
-if [ $HTTP_PROXY != " " ]
+if [ $HTTP_PROXY != "no_proxy" ]
then
export http_proxy=$HTTP_PROXY
export https_proxy=$HTTPS_PROXY
then
export http_proxy=$HTTP_PROXY
export https_proxy=$HTTPS_PROXY
HTTP_PROXY=$(cat /opt/config/http_proxy.txt)
HTTPS_PROXY=$(cat /opt/config/https_proxy.txt)
HTTP_PROXY=$(cat /opt/config/http_proxy.txt)
HTTPS_PROXY=$(cat /opt/config/https_proxy.txt)
-if [ $HTTP_PROXY != " " ]
+if [ $HTTP_PROXY != "no_proxy" ]
then
export http_proxy=$HTTP_PROXY
export https_proxy=$HTTPS_PROXY
then
export http_proxy=$HTTP_PROXY
export https_proxy=$HTTPS_PROXY
HTTP_PROXY=$(cat /opt/config/http_proxy.txt)
HTTPS_PROXY=$(cat /opt/config/https_proxy.txt)
HTTP_PROXY=$(cat /opt/config/http_proxy.txt)
HTTPS_PROXY=$(cat /opt/config/https_proxy.txt)
-if [ $HTTP_PROXY != " " ]
+if [ $HTTP_PROXY != "no_proxy" ]
then
export http_proxy=$HTTP_PROXY
export https_proxy=$HTTPS_PROXY
then
export http_proxy=$HTTP_PROXY
export https_proxy=$HTTPS_PROXY
HTTP_PROXY=$(cat /opt/config/http_proxy.txt)
HTTPS_PROXY=$(cat /opt/config/https_proxy.txt)
HTTP_PROXY=$(cat /opt/config/http_proxy.txt)
HTTPS_PROXY=$(cat /opt/config/https_proxy.txt)
-if [ $HTTP_PROXY != " " ]
+if [ $HTTP_PROXY != "no_proxy" ]
then
export http_proxy=$HTTP_PROXY
export https_proxy=$HTTPS_PROXY
then
export http_proxy=$HTTP_PROXY
export https_proxy=$HTTPS_PROXY
HTTP_PROXY=$(cat /opt/config/http_proxy.txt)
HTTPS_PROXY=$(cat /opt/config/https_proxy.txt)
HTTP_PROXY=$(cat /opt/config/http_proxy.txt)
HTTPS_PROXY=$(cat /opt/config/https_proxy.txt)
-if [ $HTTP_PROXY != " " ]
+if [ $HTTP_PROXY != "no_proxy" ]
then
export http_proxy=$HTTP_PROXY
export https_proxy=$HTTPS_PROXY
then
export http_proxy=$HTTP_PROXY
export https_proxy=$HTTPS_PROXY
HTTP_PROXY=$(cat /opt/config/http_proxy.txt)
HTTPS_PROXY=$(cat /opt/config/https_proxy.txt)
HTTP_PROXY=$(cat /opt/config/http_proxy.txt)
HTTPS_PROXY=$(cat /opt/config/https_proxy.txt)
-if [ $HTTP_PROXY != " " ]
+if [ $HTTP_PROXY != "no_proxy" ]
then
export http_proxy=$HTTP_PROXY
export https_proxy=$HTTPS_PROXY
then
export http_proxy=$HTTP_PROXY
export https_proxy=$HTTPS_PROXY
HTTP_PROXY=$(cat /opt/config/http_proxy.txt)
HTTPS_PROXY=$(cat /opt/config/https_proxy.txt)
HTTP_PROXY=$(cat /opt/config/http_proxy.txt)
HTTPS_PROXY=$(cat /opt/config/https_proxy.txt)
-if [ $HTTP_PROXY != " " ]
+if [ $HTTP_PROXY != "no_proxy" ]
then
export http_proxy=$HTTP_PROXY
export https_proxy=$HTTPS_PROXY
then
export http_proxy=$HTTP_PROXY
export https_proxy=$HTTPS_PROXY
HTTP_PROXY=$(cat /opt/config/http_proxy.txt)
HTTPS_PROXY=$(cat /opt/config/https_proxy.txt)
HTTP_PROXY=$(cat /opt/config/http_proxy.txt)
HTTPS_PROXY=$(cat /opt/config/https_proxy.txt)
-if [ $HTTP_PROXY != " " ]
+if [ $HTTP_PROXY != "no_proxy" ]
then
export http_proxy=$HTTP_PROXY
export https_proxy=$HTTPS_PROXY
then
export http_proxy=$HTTP_PROXY
export https_proxy=$HTTPS_PROXY
HTTP_PROXY=$(cat /opt/config/http_proxy.txt)
HTTPS_PROXY=$(cat /opt/config/https_proxy.txt)
HTTP_PROXY=$(cat /opt/config/http_proxy.txt)
HTTPS_PROXY=$(cat /opt/config/https_proxy.txt)
-if [ $HTTP_PROXY != " " ]
+if [ $HTTP_PROXY != "no_proxy" ]
then
export http_proxy=$HTTP_PROXY
export https_proxy=$HTTPS_PROXY
then
export http_proxy=$HTTP_PROXY
export https_proxy=$HTTPS_PROXY
HTTP_PROXY=$(cat /opt/config/http_proxy.txt)
HTTPS_PROXY=$(cat /opt/config/https_proxy.txt)
HTTP_PROXY=$(cat /opt/config/http_proxy.txt)
HTTPS_PROXY=$(cat /opt/config/https_proxy.txt)
-if [ $HTTP_PROXY != " " ]
+if [ $HTTP_PROXY != "no_proxy" ]
then
export http_proxy=$HTTP_PROXY
export https_proxy=$HTTPS_PROXY
then
export http_proxy=$HTTP_PROXY
export https_proxy=$HTTPS_PROXY
HTTP_PROXY=$(cat /opt/config/http_proxy.txt)
HTTPS_PROXY=$(cat /opt/config/https_proxy.txt)
HTTP_PROXY=$(cat /opt/config/http_proxy.txt)
HTTPS_PROXY=$(cat /opt/config/https_proxy.txt)
-if [ $HTTP_PROXY != " " ]
+if [ $HTTP_PROXY != "no_proxy" ]
then
export http_proxy=$HTTP_PROXY
export https_proxy=$HTTPS_PROXY
then
export http_proxy=$HTTP_PROXY
export https_proxy=$HTTPS_PROXY
HTTP_PROXY=$(cat /opt/config/http_proxy.txt)
HTTPS_PROXY=$(cat /opt/config/https_proxy.txt)
HTTP_PROXY=$(cat /opt/config/http_proxy.txt)
HTTPS_PROXY=$(cat /opt/config/https_proxy.txt)
-if [ $HTTP_PROXY != " " ]
+if [ $HTTP_PROXY != "no_proxy" ]
then
export http_proxy=$HTTP_PROXY
export https_proxy=$HTTPS_PROXY
then
export http_proxy=$HTTP_PROXY
export https_proxy=$HTTPS_PROXY
HTTP_PROXY=$(cat /opt/config/http_proxy.txt)
HTTPS_PROXY=$(cat /opt/config/https_proxy.txt)
HTTP_PROXY=$(cat /opt/config/http_proxy.txt)
HTTPS_PROXY=$(cat /opt/config/https_proxy.txt)
-if [ $HTTP_PROXY != " " ]
+if [ $HTTP_PROXY != "no_proxy" ]
then
export http_proxy=$HTTP_PROXY
export https_proxy=$HTTPS_PROXY
then
export http_proxy=$HTTP_PROXY
export https_proxy=$HTTPS_PROXY
HTTP_PROXY=$(cat /opt/config/http_proxy.txt)
HTTPS_PROXY=$(cat /opt/config/https_proxy.txt)
HTTP_PROXY=$(cat /opt/config/http_proxy.txt)
HTTPS_PROXY=$(cat /opt/config/https_proxy.txt)
-if [ $HTTP_PROXY != " " ]
+if [ $HTTP_PROXY != "no_proxy" ]
then
export http_proxy=$HTTP_PROXY
export https_proxy=$HTTPS_PROXY
then
export http_proxy=$HTTP_PROXY
export https_proxy=$HTTPS_PROXY
HTTP_PROXY=$(cat /opt/config/http_proxy.txt)
HTTPS_PROXY=$(cat /opt/config/https_proxy.txt)
HTTP_PROXY=$(cat /opt/config/http_proxy.txt)
HTTPS_PROXY=$(cat /opt/config/https_proxy.txt)
-if [ $HTTP_PROXY != " " ]
+if [ $HTTP_PROXY != "no_proxy" ]
then
export http_proxy=$HTTP_PROXY
export https_proxy=$HTTPS_PROXY
then
export http_proxy=$HTTP_PROXY
export https_proxy=$HTTPS_PROXY
HTTP_PROXY=$(cat /opt/config/http_proxy.txt)
HTTPS_PROXY=$(cat /opt/config/https_proxy.txt)
HTTP_PROXY=$(cat /opt/config/http_proxy.txt)
HTTPS_PROXY=$(cat /opt/config/https_proxy.txt)
-if [ $HTTP_PROXY != " " ]
+if [ $HTTP_PROXY != "no_proxy" ]
then
export http_proxy=$HTTP_PROXY
export https_proxy=$HTTPS_PROXY
then
export http_proxy=$HTTP_PROXY
export https_proxy=$HTTPS_PROXY
HTTP_PROXY=$(cat /opt/config/http_proxy.txt)
HTTPS_PROXY=$(cat /opt/config/https_proxy.txt)
HTTP_PROXY=$(cat /opt/config/http_proxy.txt)
HTTPS_PROXY=$(cat /opt/config/https_proxy.txt)
-if [ $HTTP_PROXY != " " ]
+if [ $HTTP_PROXY != "no_proxy" ]
then
export http_proxy=$HTTP_PROXY
export https_proxy=$HTTPS_PROXY
then
export http_proxy=$HTTP_PROXY
export https_proxy=$HTTPS_PROXY
HTTP_PROXY=$(cat /opt/config/http_proxy.txt)
HTTPS_PROXY=$(cat /opt/config/https_proxy.txt)
HTTP_PROXY=$(cat /opt/config/http_proxy.txt)
HTTPS_PROXY=$(cat /opt/config/https_proxy.txt)
-if [ $HTTP_PROXY != " " ]
+if [ $HTTP_PROXY != "no_proxy" ]
then
export http_proxy=$HTTP_PROXY
export https_proxy=$HTTPS_PROXY
then
export http_proxy=$HTTP_PROXY
export https_proxy=$HTTPS_PROXY
HTTP_PROXY=$(cat /opt/config/http_proxy.txt)
HTTPS_PROXY=$(cat /opt/config/https_proxy.txt)
HTTP_PROXY=$(cat /opt/config/http_proxy.txt)
HTTPS_PROXY=$(cat /opt/config/https_proxy.txt)
-if [ $HTTP_PROXY != " " ]
+if [ $HTTP_PROXY != "no_proxy" ]
then
export http_proxy=$HTTP_PROXY
export https_proxy=$HTTPS_PROXY
then
export http_proxy=$HTTP_PROXY
export https_proxy=$HTTPS_PROXY
http_proxy:
type: string
description: http proxy address
http_proxy:
type: string
description: http proxy address
https_proxy:
type: string
description: https proxy address
https_proxy:
type: string
description: https proxy address
######################
# #
######################
# #