[lxc-devel] [lxc/master] Use port 80 for key server

[taikedz on Github]

A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 825 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20170317/925ae226/attachment.bin>
-------------- next part --------------
From 0a9fc0338ec7adabc83381a9916b4e3ac5e7dbd9 Mon Sep 17 00:00:00 2001
From: Tai Kedzierski <dch.tai at gmail.com>
Date: Fri, 17 Mar 2017 12:41:27 +0000
Subject: [PATCH] Use port 80 for key server

Also, do not override the environment variable if the user has set it themselves.

--- Tai Kedzierski <dch.tai at gmail.com>
---
 templates/lxc-download.in | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/templates/lxc-download.in b/templates/lxc-download.in
index e749473..08c6501 100644
--- a/templates/lxc-download.in
+++ b/templates/lxc-download.in
@@ -33,8 +33,6 @@ DOWNLOAD_DIST=
 DOWNLOAD_FLUSH_CACHE="false"
 DOWNLOAD_FORCE_CACHE="false"
 DOWNLOAD_INTERACTIVE="false"
-DOWNLOAD_KEYID="0xE7FB0CAEC8173D669066514CBAEFF88C22F6E216"
-DOWNLOAD_KEYSERVER="hkp://pool.sks-keyservers.net"
 DOWNLOAD_LIST_IMAGES="false"
 DOWNLOAD_MODE="system"
 DOWNLOAD_READY_GPG="false"
@@ -48,17 +46,17 @@ DOWNLOAD_USE_CACHE="false"
 DOWNLOAD_VALIDATE="true"
 DOWNLOAD_VARIANT="default"
 
+DOWNLOAD_KEYID="0xE7FB0CAEC8173D669066514CBAEFF88C22F6E216"
+if [[ -z "$DOWNLOAD_KEYSERVER" ]]; then
+    DOWNLOAD_KEYSERVER="hkp://pool.sks-keyservers.net:80"
+fi
+
 LXC_MAPPED_GID=
 LXC_MAPPED_UID=
 LXC_NAME=
 LXC_PATH=
 LXC_ROOTFS=
 
-# Deal with GPG over http proxy
-if [ -n "${http_proxy:-}" ]; then
-    DOWNLOAD_KEYSERVER="hkp://p80.pool.sks-keyservers.net:80"
-fi
-
 # Make sure the usual locations are in PATH
 export PATH=$PATH:/usr/sbin:/usr/bin:/sbin:/bin