Merge "support no_proxy environment variable"
diff --git a/AUTHORS b/AUTHORS
index ab929ca..4f771ce 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -29,6 +29,7 @@
Justin Shepherd <galstrom21@gmail.com>
Ken Pepple <ken.pepple@rabbityard.com>
Kiall Mac Innes <kiall@managedit.ie>
+Osamu Habuka <xiu.yushen@gmail.com>
Russell Bryant <rbryant@redhat.com>
Scott Moser <smoser@ubuntu.com>
Thierry Carrez <thierry@openstack.org>
diff --git a/functions b/functions
index b66dc15..1267dfc 100644
--- a/functions
+++ b/functions
@@ -17,6 +17,7 @@
[[ "$(id -u)" = "0" ]] && sudo="env"
$sudo DEBIAN_FRONTEND=noninteractive \
http_proxy=$http_proxy https_proxy=$https_proxy \
+ no_proxy=$no_proxy \
apt-get --option "Dpkg::Options::=--force-confold" --assume-yes "$@"
}
@@ -486,6 +487,7 @@
$SUDO_PIP PIP_DOWNLOAD_CACHE=${PIP_DOWNLOAD_CACHE:-/var/cache/pip} \
HTTP_PROXY=$http_proxy \
HTTPS_PROXY=$https_proxy \
+ NO_PROXY=$no_proxy \
$CMD_PIP install --use-mirrors $@
}
@@ -521,6 +523,7 @@
$SUDO_CMD \
HTTP_PROXY=$http_proxy \
HTTPS_PROXY=$https_proxy \
+ NO_PROXY=$no_proxy \
python setup.py develop \
)
}
@@ -574,6 +577,7 @@
local sudo="sudo"
[[ "$(id -u)" = "0" ]] && sudo="env"
$sudo http_proxy=$http_proxy https_proxy=$https_proxy \
+ no_proxy=$no_proxy \
yum install -y "$@"
}
diff --git a/stack.sh b/stack.sh
index 6b8362c..2af76ba 100755
--- a/stack.sh
+++ b/stack.sh
@@ -60,16 +60,21 @@
source $TOP_DIR/stackrc
# HTTP and HTTPS proxy servers are supported via the usual environment variables
-# ``http_proxy`` and ``https_proxy``. They can be set in ``localrc`` if necessary
+# ``http_proxy`` and ``https_proxy``. Additionally if you would like to access
+# to specific server directly and not through the proxy server, you can use
+# ``no_proxy`` environment variable. They can be set in ``localrc`` if necessary
# or on the command line::
#
-# http_proxy=http://proxy.example.com:3128/ ./stack.sh
+# http_proxy=http://proxy.example.com:3128/ no_proxy=repo.example.net ./stack.sh
if [[ -n "$http_proxy" ]]; then
export http_proxy=$http_proxy
fi
if [[ -n "$https_proxy" ]]; then
export https_proxy=$https_proxy
fi
+if [[ -n "$no_proxy" ]]; then
+ export no_proxy=$no_proxy
+fi
# Destination path for installation ``DEST``
DEST=${DEST:-/opt/stack}