download: Fix previous change

The previous change to support http proxies only worked when http_proxy was set... Instead add some detection code and only use :80 when using http_proxy. That's a bit of a workaround, but it's the only way I could find to get GPG to work with http_proxy. Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>

download: Fix previous change
4eb706b3 · Stéphane Graber · ca0abdee · 4eb706b3
Unverified Commit 4eb706b3 authored Feb 06, 2014 by Stéphane Graber
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

lxc-download.in templates/lxc-download.in +6 -1

No files found.
--- a/templates/lxc-download.in
+++ b/templates/lxc-download.in
@@ -32,7 +32,7 @@ DOWNLOAD_ARCH=
 DOWNLOAD_VARIANT="default"
 DOWNLOAD_SERVER="images.linuxcontainers.org"
 DOWNLOAD_KEYID="0xBAEFF88C22F6E216"
-DOWNLOAD_KEYSERVER="hkp://pool.sks-keyservers.net:80"
+DOWNLOAD_KEYSERVER="hkp://pool.sks-keyservers.net"
 DOWNLOAD_VALIDATE="true"
 DOWNLOAD_FLUSH_CACHE="false"
 DOWNLOAD_FORCE_CACHE="false"
@@ -53,6 +53,11 @@ LXC_ROOTFS=
 LXC_MAPPED_UID=
 LXC_MAPPED_GID=

+# Deal with GPG over http proxy
+if [ -n "${http_proxy:-}" ]; then
+    DOWNLOAD_KEYSERVER="${DOWNLOAD_KEYSERVER}:80"
+fi
+
 # Some useful functions
 cleanup() {
    if [ -d "$DOWNLOAD_TEMP" ]; then