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

local-config: Configure proxy for apt and/or yum

Browse Source 
Fixes fail to build image on Fedora

Change-Id: I30324081702ffc68e82499d81a841c8ae17119ce
This commit is contained in:
Clint Byrum
2013-03-08 03:24:45 -08:00
parent 28aa222b20
commit 4da169ce6e
1 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,18 +5,32 @@
set -e set -e
set -o xtrace set -o xtrace
if [ -d /etc/apt ] ; then
have_apt=1
fi
if [ -e /etc/yum.conf ] ; then
have_yum=1
fi
if [ -n "$http_proxy" ]; then if [ -n "$http_proxy" ]; then
if [ -d ~stack ]; then if [ -d ~stack ]; then
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 if [ -n "$have_apt" ] ; then
echo "Acquire::http::Proxy \"$http_proxy\";" > /etc/apt/apt.conf.d/61-use-http-proxy
fi
if [ -n "$have_yum" ] ; then
sed -i -e "s,\[main\],[main]\nproxy=$http_proxy," /etc/yum.conf
fi
fi fi
if [ -n "$https_proxy" ]; then if [ -n "$https_proxy" ]; then
if [ -d ~stack ]; then if [ -d ~stack ]; then
echo export https_proxy=$https_proxy >> ~stack/.profile echo export https_proxy=$https_proxy >> ~stack/.profile
fi fi
echo "Acquire::https::Proxy \"$https_proxy\";" > /etc/apt/apt.conf.d/61-use-https-proxy if [ -n "$have_apt" ] ; then
echo "Acquire::https::Proxy \"$https_proxy\";" > /etc/apt/apt.conf.d/61-use-https-proxy
fi
fi fi
if [ -n "$http_proxy" -o -n "$https_proxy" ]; then if [ -n "$http_proxy" -o -n "$https_proxy" ]; then