Also export the proxy for https usage

And clarify the documentation about it.

Signed-off-by: Iustin Pop <iustin@google.com>
Reviewed-by: Michael Hanselmann <hansmi@google.com>

diff --git a/create b/create
index 1f3c0bd..072905c 100755 (executable)
--- a/create
+++ b/create
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright (C) 2007, 2008, 2009 Google Inc.
+# Copyright (C) 2007, 2008, 2009, 2012 Google Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -75,6 +75,7 @@ if [ -f "$CACHE_FILE" ]; then
 else
   if [ "$PROXY" ]; then
     export http_proxy="$PROXY"
+    export https_proxy="$PROXY"
   fi
   # INCLUDE will be empty if EXTRA_PKGS is null/empty, otherwise we
   # build the full parameter format from it

diff --git a/defaults b/defaults
index 407be16..19df420 100644 (file)
--- a/defaults
+++ b/defaults
@@ -4,10 +4,12 @@
 # on the next instance, customize this file before the instance
 # installation
 
-# PROXY: if non-null, use this as an http-proxy in order to speed up
-# non-cached installs; not that if not set, debootstrap might still
-# use a system-wide proxy setting if it is exported in the
-# ganeti-noded daemon environment
+# PROXY: if non-null, use this as an http(s)-proxy in order to speed
+# up non-cached installs or provide internet access if not directly
+# possible; not that if not set, debootstrap might still use a
+# system-wide proxy setting if it is exported in the ganeti-noded
+# daemon environment (but the node daemon environment is cleaned up
+# and not exported starting with Ganeti 2.5)
 # PROXY="http://proxy.example.com:3128/"
 
 # MIRROR: do not customize MIRROR if you want to be able to install

diff --git a/examples/hooks/grub b/examples/hooks/grub
index 43ec160..c242df5 100755 (executable)
--- a/examples/hooks/grub
+++ b/examples/hooks/grub
@@ -24,6 +24,7 @@ fi
 export LANG=C
 if [ "$PROXY" ]; then
   export http_proxy="$PROXY"
+  export https_proxy="$PROXY"
 fi
 export DEBIAN_FRONTEND=noninteractive
 chroot "$TARGET" apt-get -y --force-yes install grub grub-common