openstack/deb-python-diskimage-builder
Code Issues Proposed changes

Copy both http and https proxy to local-config.

Browse Source 
Previously, only http_proxy was copied into the local-config image.
We now preserve both http_proxy and https_proxy settings.

Change-Id: I4de2712f2772fb7d07b228cecdc0c8ec6f3df567
Co-authored-by: Chris Krelle <nobodycam@gmail.com>
This commit is contained in:
Devananda van der Veen
2012-12-07 14:52:35 -08:00
parent 1f39f4c629
commit dba9418f03
1 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
elements/local-config/install.d/61-http-proxy
View File

@@ -6,9 +6,21 @@ set -e
set -o xtrace set -o xtrace
if [ -n "$http_proxy" ]; then if [ -n "$http_proxy" ]; then
if [ -d ~stack ]; then if [ -d ~stack ]; then
echo export no_proxy=192.0.2.1 >> ~stack/.profile
echo export http_proxy=$http_proxy >> ~stack/.profile echo export http_proxy=$http_proxy >> ~stack/.profile
fi fi
echo "Acquire::http::Proxy \"$http_proxy\";" > /etc/apt/apt.conf.d/61-use-http-proxy echo "Acquire::http::Proxy \"$http_proxy\";" > /etc/apt/apt.conf.d/61-use-http-proxy
fi
if [ -n "$https_proxy" ]; then
if [ -d ~stack ]; then
echo export https_proxy=$https_proxy >> ~stack/.profile
fi
echo "Acquire::https::Proxy \"$https_proxy\";" > /etc/apt/apt.conf.d/61-use-https-proxy
fi
if [ -n "$http_proxy" -o -n "$https_proxy"]; then
if [ -d ~stack ]; then
echo export no_proxy=192.0.2.1 >> ~stack/.profile
fi
fi fi