From 2fa0791f5f3e918e3d92da63d0d571e44521fa4a Mon Sep 17 00:00:00 2001
From: Jephte CLAIN <Jephte.Clain@univ-reunion.fr>
Date: Mon, 22 Jun 2015 11:37:25 +0400
Subject: [PATCH 1/2] =?UTF-8?q?profile.d/proxy=20lit=20aussi=20les=20valeu?=
 =?UTF-8?q?rs=20par=20d=C3=A9faut=20pour=20l'h=C3=B4te?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/profile.d/proxy.shared | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/lib/profile.d/proxy.shared b/lib/profile.d/proxy.shared
index a141220..0ac3c04 100644
--- a/lib/profile.d/proxy.shared
+++ b/lib/profile.d/proxy.shared
@@ -11,9 +11,16 @@ function set_proxy() {
         local FTP_PROXY_HOST FTP_PROXY_PORT
         local PROXY_LOCAL_DOMAINS AUTHFTP_PROXY_HOST
 
-        [ -f "$HOME/etc/default/proxy" ] && source "$HOME/etc/default/proxy"
+        local default_profile
+        if [ -f "$HOME/etc/default.${HOSTNAME%%.*}/proxy" ]; then
+            default_profile="$HOME/etc/default.${HOSTNAME%%.*}/proxy"
+        elif [ -f "$HOME/etc/default/proxy" ]; then
+            default_profile="$HOME/etc/default/proxy"
+        fi
+        [ -f "$default_profile" ] && source "$default_profile"
+
         if [ -n "$PROXY_ENABLE_LIBPROXY" -a -x /usr/bin/proxy ]; then
-            local -a proxies=($(proxy <<<http://www.google.fr/ 2>/dev/null))
+            local -a proxies=($(/usr/bin/proxy <<<http://www.google.fr/ 2>/dev/null))
             proxy="${proxies[0]}"
             if [ "$proxy" == "direct://" ]; then
                 # pas de proxy
@@ -29,7 +36,7 @@ function set_proxy() {
                 return
             fi
             unset no_proxy
-        elif [ -f "$HOME/etc/default/proxy" ]; then
+        elif [ -f "$default_profile" ]; then
             # proxy par défaut
             if [ -n "$HTTP_PROXY_HOST" ]; then
                 proxy="http://$HTTP_PROXY_HOST:${HTTP_PROXY_PORT:-3128}/"

From 71aa7156573ad8b55e2358f712d339958b8c75c7 Mon Sep 17 00:00:00 2001
From: Jephte CLAIN <Jephte.Clain@univ-reunion.fr>
Date: Mon, 22 Jun 2015 11:37:49 +0400
Subject: [PATCH 2/2] Init changelog & version 2.1.1

---
 CHANGES.txt | 5 +++++
 VERSION.txt | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 814901a..09ef6b6 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,3 +1,8 @@
+## Version 2.1.1 du 22/06/2015-11:37
+
+40225b0 Intégration de la branche proxy-default
+2fa0791 profile.d/proxy lit aussi les valeurs par défaut pour l'hôte
+
 ## Version 2.1.0 du 22/06/2015-10:25
 
 2a3eb76 Intégration de la branche uenv-modifs
diff --git a/VERSION.txt b/VERSION.txt
index 7ec1d6d..3e3c2f1 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -1 +1 @@
-2.1.0
+2.1.1