From 84bc5fbdc6fade6e34d0a9c888d49fe97c4ce403 Mon Sep 17 00:00:00 2001
From: Nicolas KAROLAK <nicolas@karolak.fr>
Date: Wed, 1 Aug 2018 16:05:41 +0200
Subject: [PATCH] add uppercase envvars
---
3.New_server_deployment/3.Proxy_settings/0_setup.py | 3 +++
1 file changed, 3 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 1d820a9c..8ccb1b46 100644
--- a/3.New_server_deployment/3.Proxy_settings/0_setup.py
+++ b/3.New_server_deployment/3.Proxy_settings/0_setup.py
@@ -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'
if http_proxy:
environment += 'http_proxy="%s"\n' % http_proxy
+ environment += 'HTTP_PROXY="%s"\n' % http_proxy
if https_proxy:
environment += 'https_proxy="%s"\n' % https_proxy
+ environment += 'HTTPS_PROXY="%s"\n' % https_proxy
if http_proxy or https_proxy:
no_proxy = no_proxy + ',' if no_proxy else ''
no_proxy += 'localhost'
@@ -24,6 +26,7 @@ def setup(interactive=True):
no_proxy += ',' + utils.get_conf('MONITOR_SERVER_NAME', 'monitor')
no_proxy += ',' + utils.get_conf('CM_SERVER_NAME', 'campusmanager')
environment += 'no_proxy="%s"\n' % no_proxy
+ environment += 'NO_PROXY="%s"\n' % no_proxy
# apt
apt_proxy_path = '/etc/apt/apt.conf.d/proxy'
apt_proxy = ''
--
GitLab