summaryrefslogtreecommitdiffstats
path: root/vagrant
diff options
context:
space:
mode:
authoranonym <anonym@riseup.net>2019-04-02 22:47:06 +0200
committeranonym <anonym@riseup.net>2019-04-02 22:53:21 +0200
commite9a30cde018c9c8aded31c8b1f2d41b88e20667a (patch)
treee2f91a1275fb835be47867886256e9c1a832ee58 /vagrant
parent6370ba62f331a6c715cbcdb625f4b9a5f7af13a4 (diff)
Build system: add vmproxy+extproxy option.
When enabled, use the vmproxy but configure it to in turn use the exproxy set via the http_proxy environment variable.
Diffstat (limited to 'vagrant')
-rwxr-xr-xvagrant/provision/setup-tails-builder3
1 files changed, 3 insertions, 0 deletions
diff --git a/vagrant/provision/setup-tails-builder b/vagrant/provision/setup-tails-builder
index d4b11ef..b223266 100755
--- a/vagrant/provision/setup-tails-builder
+++ b/vagrant/provision/setup-tails-builder
@@ -41,6 +41,9 @@ if [ "${TAILS_PROXY_TYPE}" = "vmproxy" ]; then
install -o root -g root -m 644 /vagrant/provision/assets/acng.conf /etc/apt-cacher-ng/acng.conf
[ "${TAILS_OFFLINE_MODE}" = 1 ] || TAILS_OFFLINE_MODE=0
echo "Offlinemode: ${TAILS_OFFLINE_MODE}" > /etc/apt-cacher-ng/network.conf
+ if [ -n "${TAILS_ACNG_PROXY:-}" ]; then
+ echo "Proxy: ${TAILS_ACNG_PROXY}" >> /etc/apt-cacher-ng/network.conf
+ fi
systemctl restart apt-cacher-ng.service
fi