Skip to content
Snippets Groups Projects
Commit 84bc5fbd authored by Nicolas KAROLAK's avatar Nicolas KAROLAK
Browse files

add uppercase envvars

parent 17185d25
No related branches found
No related tags found
No related merge requests found
...@@ -15,8 +15,10 @@ def setup(interactive=True): ...@@ -15,8 +15,10 @@ def setup(interactive=True):
environment = 'PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games"\n' environment = 'PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games"\n'
if http_proxy: if http_proxy:
environment += 'http_proxy="%s"\n' % http_proxy environment += 'http_proxy="%s"\n' % http_proxy
environment += 'HTTP_PROXY="%s"\n' % http_proxy
if https_proxy: if https_proxy:
environment += 'https_proxy="%s"\n' % https_proxy environment += 'https_proxy="%s"\n' % https_proxy
environment += 'HTTPS_PROXY="%s"\n' % https_proxy
if http_proxy or https_proxy: if http_proxy or https_proxy:
no_proxy = no_proxy + ',' if no_proxy else '' no_proxy = no_proxy + ',' if no_proxy else ''
no_proxy += 'localhost' no_proxy += 'localhost'
...@@ -24,6 +26,7 @@ def setup(interactive=True): ...@@ -24,6 +26,7 @@ def setup(interactive=True):
no_proxy += ',' + utils.get_conf('MONITOR_SERVER_NAME', 'monitor') no_proxy += ',' + utils.get_conf('MONITOR_SERVER_NAME', 'monitor')
no_proxy += ',' + utils.get_conf('CM_SERVER_NAME', 'campusmanager') no_proxy += ',' + utils.get_conf('CM_SERVER_NAME', 'campusmanager')
environment += 'no_proxy="%s"\n' % no_proxy environment += 'no_proxy="%s"\n' % no_proxy
environment += 'NO_PROXY="%s"\n' % no_proxy
# apt # apt
apt_proxy_path = '/etc/apt/apt.conf.d/proxy' apt_proxy_path = '/etc/apt/apt.conf.d/proxy'
apt_proxy = '' apt_proxy = ''
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment