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 8490fc3ab4291a7ab16d4b2572e8096fc4873f4e..38449921ba215d51af25860496475488d8c08114 100644 --- a/3.New_server_deployment/3.Proxy_settings/0_setup.py +++ b/3.New_server_deployment/3.Proxy_settings/0_setup.py @@ -27,17 +27,10 @@ def setup(interactive=True): 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): diff --git a/6.CampusManager/2.Configure_apt_cacher_ng/0_setup.py b/6.CampusManager/2.Configure_apt_cacher_ng/0_setup.py new file mode 100755 index 0000000000000000000000000000000000000000..8f1983b57f2d04135d3dd3084f2fa9be7cecc128 --- /dev/null +++ b/6.CampusManager/2.Configure_apt_cacher_ng/0_setup.py @@ -0,0 +1,24 @@ +#!/usr/bin/env python3 +# -*- coding: utf-8 -*- +import os +import re + +import utils + + +def setup(interactive=True): + http_proxy = utils.get_conf('PROXY_HTTP') + # apt-cacher-ng + path = '/etc/apt-cacher-ng/acng.conf' + if os.path.exists(path): + with open(path, 'r') as fo: + current_conf = fo.read() + new_conf = re.sub(r'\nProxy:.*', '', current_conf).strip() + '\n' + if http_proxy: + new_conf += '\nProxy: %s\n' % http_proxy + if current_conf != new_conf: + with open(path, 'w') as fo: + fo.write(new_conf) + utils.log('File "%s" updated.' % path) + else: + utils.log('File "%s" already up to date.' % path) diff --git a/launcher.sh b/launcher.sh index 6a3e0ef57cf5adf4b5c8b6dbbcafba7af10a4bdf..f35819817ef2648e7caaa6a928edb82eee57bfaf 100755 --- a/launcher.sh +++ b/launcher.sh @@ -56,6 +56,7 @@ campusmanager() { python3 /root/envsetup/envsetup.py 23 python3 /root/envsetup/envsetup.py 25 python3 /root/envsetup/envsetup.py 61 + python3 /root/envsetup/envsetup.py 62 python3 /root/envsetup/envsetup.py 25 }