The branch, tmpfs has been updated via 8b6031bef72e12b3516ef9c169fa7c9c6ab5cdf6 (commit) from 75db9d5b6d390f677f892ab10e98c9ababaeef5e (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 8b6031bef72e12b3516ef9c169fa7c9c6ab5cdf6 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Jun 15 22:57:26 2011 +0200 Add https_proxy env variable support. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + x2gothinclientmanagement/bin/x2gothinclient_create | 2 ++ x2gothinclientmanagement/bin/x2gothinclient_shell | 1 + .../bin/x2gothinclient_upgrade | 1 + .../etc/x2gothinclient_settings | 3 +++ 5 files changed, 8 insertions(+), 0 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index aada42a..7b758f4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -19,6 +19,7 @@ x2gothinclient (1.0.1.3-0~x2go1) UNRELEASED; urgency=low * Add man page for x2gothinclient_preptftpboot. * Do not run management script if there is a problem with the X2go TCE chroot. * X2go TCE management script have to run as root. + * Add https_proxy env variable support. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Sat, 28 May 2011 12:04:34 +0200 diff --git a/x2gothinclientmanagement/bin/x2gothinclient_create b/x2gothinclientmanagement/bin/x2gothinclient_create index 54eeb05..8a78498 100755 --- a/x2gothinclientmanagement/bin/x2gothinclient_create +++ b/x2gothinclientmanagement/bin/x2gothinclient_create @@ -63,6 +63,7 @@ mkdir -p $TC_CHROOT # use a proxy server for APT (if any is configured) export http_proxy="$TC_HTTP_PROXY" +export https_proxy="$TC_HTTPS_PROXY" export ftp_proxy="$TC_FTP_PROXY" debootstrap --arch i386 stable $TC_CHROOT/ $TC_DEBMIRROR_URL @@ -96,6 +97,7 @@ mount /proc mount /dev/pts export HOME=/root export http_proxy=$TC_HTTP_PROXY +export https_proxy=$TC_HTTPS_PROXY export ftp_proxy=$TC_FTP_PROXY mkdir -p /tmp/user/0 diff --git a/x2gothinclientmanagement/bin/x2gothinclient_shell b/x2gothinclientmanagement/bin/x2gothinclient_shell index 750c32e..5e69a8f 100755 --- a/x2gothinclientmanagement/bin/x2gothinclient_shell +++ b/x2gothinclientmanagement/bin/x2gothinclient_shell @@ -53,6 +53,7 @@ export HOME=/root # export the proxy server (if any) to the shell. export http_proxy=$TC_HTTP_PROXY +export https_proxy=$TC_HTTPS_PROXY export ftp_proxy=$TC_FTP_PROXY echo 'This shell has been started in your X2go Thin Clients chroot environment. All changes performed here' diff --git a/x2gothinclientmanagement/bin/x2gothinclient_upgrade b/x2gothinclientmanagement/bin/x2gothinclient_upgrade index 36f03eb..e345d5d 100755 --- a/x2gothinclientmanagement/bin/x2gothinclient_upgrade +++ b/x2gothinclientmanagement/bin/x2gothinclient_upgrade @@ -51,6 +51,7 @@ mount /dev/pts &> /dev/null export HOME=/root export http_proxy=$TC_HTTP_PROXY +export https_proxy=$TC_HTTPS_PROXY export ftp_proxy=$TC_FTP_PROXY [ $? -eq 0 ] && apt-get update diff --git a/x2gothinclientmanagement/etc/x2gothinclient_settings b/x2gothinclientmanagement/etc/x2gothinclient_settings index af5c905..758efcc 100644 --- a/x2gothinclientmanagement/etc/x2gothinclient_settings +++ b/x2gothinclientmanagement/etc/x2gothinclient_settings @@ -38,8 +38,10 @@ TC_X2GO_DEBURL="deb http://packages.x2go.org/debian stable main" # Use a http/ftp proxy during debootstrap (leave empty if direct connections to http/ftp are allowed) # TC_HTTP_PROXY="http://proxy.mydomain.com:8080" +# TC_HTTPS_PROXY="http://proxy.mydomain.com:8080" # TC_FTP_PROXY="http://proxy.mydomain.com:8080" TC_HTTP_PROXY="" +TC_HTTPS_PROXY="" TC_FTP_PROXY="" # tftp boot environment (PXE/syslinux files delivered via tftpd) @@ -58,6 +60,7 @@ echo "TC_SHELL=$TC_SHELL" echo "TC_DEBMIRROR_URL=$TC_DEBMIRROR_URL" echo "TC_X2GO_DEBURL=$TC_X2GO_DEBURL" echo "TC_HTTP_PROXY=$TC_HTTP_PROXY" +echo "TC_HTTPS_PROXY=$TC_HTTPS_PROXY" echo "TC_FTP_PROXY=$TC_FTP_PROXY" echo "TC_TFTP_BOOT=$TC_TFTP_BOOT" echo hooks/post-receive -- x2gothinclient.git (X2go Thin Client Environment) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2gothinclient.git" (X2go Thin Client Environment).