From 5b3fb59e19197fe4468f02b086ec185836834d2f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florent=20Thi=C3=A9ry?= <florent.thiery@ubicast.eu>
Date: Tue, 11 Apr 2017 15:07:26 +0200
Subject: [PATCH] also configure apt-cacher-ng proxy, fixes #21177
---
3.New_server_deployment/3.Proxy_settings/0_setup.py | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/3.New_server_deployment/3.Proxy_settings/0_setup.py b/3.New_server_deployment/3.Proxy_settings/0_setup.py
index c22c098d..8490fc3a 100644
--- a/3.New_server_deployment/3.Proxy_settings/0_setup.py
+++ b/3.New_server_deployment/3.Proxy_settings/0_setup.py
@@ -26,10 +26,18 @@ def setup(interactive=True):
apt_proxy += 'Acquire::http::Proxy "%s";\n' % http_proxy
if https_proxy:
apt_proxy += 'Acquire::https::Proxy "%s";\n' % https_proxy
+
+ # apt-cacher-ng
+ apt_cacher_ng_conf_path = '/etc/apt-cacher-ng/acng.conf'
+ apt_cacher_ng_proxy = ''
+ if http_proxy:
+ apt_cacher_ng_proxy += 'Proxy: %s' % http_proxy
+
# write changes
files = (
(environment_path, environment),
(apt_proxy_path, apt_proxy),
+ (apt_cacher_ng_conf_path, apt_cacher_ng_proxy),
)
for path, content in files:
if os.path.exists(path):
--
GitLab