[Qa-jenkins-scm] [jenkins.debian.net] 01/02: reproducible arch: use proxy everywhere

[Holger Levsen]

This is an automated email from the git hooks/post-receive script.

holger pushed a commit to branch master
in repository jenkins.debian.net.

commit e4457148ff14e5838a50573a88002afbf9b349f7
Author: Holger Levsen <holger at layer-acht.org>
Date:   Sat Oct 17 13:29:48 2015 +0200

    reproducible arch: use proxy everywhere
---
 bin/reproducible_arch_schroot_setup.sh | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/bin/reproducible_arch_schroot_setup.sh b/bin/reproducible_arch_schroot_setup.sh
index d7af668..d0d9e92 100755
--- a/bin/reproducible_arch_schroot_setup.sh
+++ b/bin/reproducible_arch_schroot_setup.sh
@@ -59,8 +59,19 @@ trap - INT TERM EXIT
 ROOTCMD="schroot --directory /tmp -c source:jenkins-reproducible-arch -u root --"
 USERCMD="schroot --directory /tmp -c source:jenkins-reproducible-arch -u jenkins --"
 
-# configure root user
-echo "export http_proxy=$http_proxy" | tee -a $SCHROOT_BASE/$TARGET/root/.bashrc
+# configure proxy everywhere
+tee $SCHROOT_BASE/$TARGET/etc/profile.d/proxy.sh <<-__END__
+	export http_proxy=$http_proxy
+	export https_proxy=$http_proxy
+	export ftp_proxy=$http_proxy
+	export rsync_proxy=$http_proxy
+	export HTTP_PROXY=$http_proxy
+	export HTTPS_PROXY=$http_proxy
+	export FTP_PROXY=$http_proxy
+	export RSYNC_PROXY=$http_proxy
+	export no_proxy="localhost,127.0.0.1"
+	__END__
+chmod 755 $SCHROOT_BASE/$TARGET/etc/profile.d/proxy.sh
 
 # configure pacman
 $ROOTCMD pacman-key --init
@@ -76,7 +87,6 @@ echo 'jenkins ALL= NOPASSWD: /usr/sbin/pacman *' | $ROOTCMD tee -a /etc/sudoers
 # configure jenkins user
 $ROOTCMD mkdir /var/lib/jenkins
 $ROOTCMD chown -R jenkins:jenkins /var/lib/jenkins
-echo "export http_proxy=$http_proxy" | tee -a $SCHROOT_BASE/$TARGET/var/lib/jenkins/.bashrc
 $USERCMD gpg --check-trustdb # first run will create ~/.gnupg/gpg.conf
 $USERCMD gpg --recv-keys 0x091AB856069AAA1C
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/qa/jenkins.debian.net.git