From 010a86c6f1bd76308a48b34e28308ade8039fa40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Diemer?= <stephane.diemer@ubicast.eu>
Date: Thu, 10 Aug 2017 08:50:07 +0200
Subject: [PATCH] Add app vhosts in no_proxy (refs #21514).
---
3.New_server_deployment/3.Proxy_settings/0_setup.py | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
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 38449921..1d820a9c 100644
--- a/3.New_server_deployment/3.Proxy_settings/0_setup.py
+++ b/3.New_server_deployment/3.Proxy_settings/0_setup.py
@@ -17,7 +17,12 @@ def setup(interactive=True):
environment += 'http_proxy="%s"\n' % http_proxy
if https_proxy:
environment += 'https_proxy="%s"\n' % https_proxy
- if no_proxy:
+ if http_proxy or https_proxy:
+ no_proxy = no_proxy + ',' if no_proxy else ''
+ no_proxy += 'localhost'
+ no_proxy += ',' + utils.get_conf('MS_SERVER_NAME', 'mediaserver')
+ 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
# apt
apt_proxy_path = '/etc/apt/apt.conf.d/proxy'
--
GitLab