From 2843e8a80290b8c9c39a947a45932f38cd0b81af Mon Sep 17 00:00:00 2001
From: Robert Collins <rbtcollins@hp.com>
Date: Thu, 27 Feb 2014 08:53:45 +1300
Subject: [PATCH] Improve local-config proxy handling.

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
---
 .../02-proxy-settings}                        | 26 ++++++++++++++-----
 1 file changed, 19 insertions(+), 7 deletions(-)
 rename elements/local-config/{install.d/61-http-proxy => pre-install.d/02-proxy-settings} (61%)
 mode change 100755 => 100644

diff --git a/elements/local-config/install.d/61-http-proxy b/elements/local-config/pre-install.d/02-proxy-settings
old mode 100755
new mode 100644
similarity index 61%
rename from elements/local-config/install.d/61-http-proxy
rename to elements/local-config/pre-install.d/02-proxy-settings
index 255df7e6..f4050fdf
--- a/elements/local-config/install.d/61-http-proxy
+++ b/elements/local-config/pre-install.d/02-proxy-settings
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Save the HTTP if one is available.
+# Save the HTTP/[S] and noproxy settings if available.
 # XXX: Obviously not suitable for downloadable images.
 
 set -e
@@ -20,7 +20,7 @@ if [ -n "$http_proxy" ]; 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/61-use-http-proxy
+     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
@@ -35,19 +35,31 @@ if [ -n "$https_proxy" ]; 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/61-use-https-proxy
+     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
 
-if [ -n "$http_proxy" -o -n "$https_proxy" ]; then
+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=192.0.2.1 >> ~stack/.profile
+      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,^PROXY_ENABLED=.*$,PROXY_ENABLED=\"yes\"," \
-             -e "s,^\(NO_PROXY=.*\)\"$,\1\, 192.0.2.1\"," /etc/sysconfig/proxy
+      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