2843e8a802
We were applying proxy settings after apt-get install runs are done in the Ubuntu element, which made it ineffective. Secondly, we were not applying no_proxy settings to apt, which caused it to fail in corporate settings. More explicit control may be facilitated in future but local-config is a DTRT tool, and so we should help it DTRT. I think I've correctly setup Zypper for this, and I have no idea how to make the same improvement for Yum (and also Yum currently doesn't set HTTPS proxies, which may lead to similar reports there). Change-Id: Idbb9781d64d44b717ea22a25429383fa45d84148
65 lines
1.8 KiB
Bash
65 lines
1.8 KiB
Bash
#!/bin/bash
|
|
# Save the HTTP/[S] and noproxy settings if available.
|
|
# XXX: Obviously not suitable for downloadable images.
|
|
|
|
set -e
|
|
set -o xtrace
|
|
|
|
if [ -d /etc/apt ] ; then
|
|
have_apt=1
|
|
fi
|
|
if [ -e /etc/yum.conf ] ; then
|
|
have_yum=1
|
|
fi
|
|
if [ -d /etc/zypp ] ; then
|
|
have_zypper=1
|
|
fi
|
|
|
|
if [ -n "$http_proxy" ]; then
|
|
if [ -d ~stack ]; then
|
|
echo export http_proxy=$http_proxy >> ~stack/.profile
|
|
fi
|
|
if [ -n "$have_apt" ] ; then
|
|
echo "Acquire::http::Proxy \"$http_proxy\";" > /etc/apt/apt.conf.d/02-use-http-proxy
|
|
fi
|
|
if [ -n "$have_yum" ] ; then
|
|
sed -i -e "s,\[main\],[main]\nproxy=$http_proxy," /etc/yum.conf
|
|
fi
|
|
if [ -n "$have_zypper" ] ; then
|
|
sed -i -e "s,^HTTP_PROXY=.*$,HTTP_PROXY=\"$http_proxy\"," /etc/sysconfig/proxy
|
|
fi
|
|
fi
|
|
|
|
if [ -n "$https_proxy" ]; then
|
|
if [ -d ~stack ]; then
|
|
echo export https_proxy=$https_proxy >> ~stack/.profile
|
|
fi
|
|
if [ -n "$have_apt" ] ; then
|
|
echo "Acquire::https::Proxy \"$https_proxy\";" > /etc/apt/apt.conf.d/02-use-https-proxy
|
|
fi
|
|
if [ -n "$have_zypper" ] ; then
|
|
sed -i -e "s,^HTTPS_PROXY=.*$,HTTPS_PROXY=\"$https_proxy\"," /etc/sysconfig/proxy
|
|
fi
|
|
fi
|
|
|
|
no_proxy=${no_proxy:+"$no_proxy,192.0.2.1"}
|
|
no_proxy=${no_proxy:-"192.0.2.1"}
|
|
if [ -n "$no_proxy" ]; then
|
|
if [ -d ~stack ]; then
|
|
echo export no_proxy=$no_proxy >> ~stack/.profile
|
|
fi
|
|
if [ -n "$have_apt" ] ; then
|
|
for host in $(sed 's/,/ /g' <<<$no_proxy); do
|
|
echo "Acquire::http::Proxy::$host \"DIRECT\";" >> /etc/apt/apt.conf.d/02-no-proxy
|
|
done
|
|
fi
|
|
if [ -n "$have_zypper" ] ; then
|
|
sed -i -e "s,^\(NO_PROXY=.*\)\"$,\1\, $no_proxy\"," /etc/sysconfig/proxy
|
|
fi
|
|
fi
|
|
|
|
if [ -n "$http_proxy" -o -n "$https_proxy" -o -n "$no_proxy" ]; then
|
|
if [ -n "$have_zypper" ] ; then
|
|
sed -i -e "s,^PROXY_ENABLED=.*$,PROXY_ENABLED=\"yes\"," /etc/sysconfig/proxy
|
|
fi
|
|
fi
|