[Pkg-nagios-changes] [SCM] UNNAMED PROJECT branch, debian/master, updated. 810edbdd3feedbfe37f4a65bee50b57b2f60fa2a

[David GUENAULT]

The following commit has been merged in the debian/master branch:
commit 7b6be86b4636a61ef24d70bffeb8fa0ab6f8e888
Author: David GUENAULT <dguenault at monitoring-fr.org>
Date:   Sun Feb 19 08:15:38 2012 +0100

    Add warning message for proxy usage

diff --git a/contrib/alternative-installation/shinken-install/shinken.conf b/contrib/alternative-installation/shinken-install/shinken.conf
index 48ef9b9..bf1da6a 100644
--- a/contrib/alternative-installation/shinken-install/shinken.conf
+++ b/contrib/alternative-installation/shinken-install/shinken.conf
@@ -21,7 +21,7 @@
 
 export TMP=${TMP:-"/tmp"}
 # proxy support
-export PROXY=""
+export USEPROXY=${USEPROXY:-0}
 # for shinken
 export VERSION=${VERSION:-"master"}
 export TARGET=${TARGET:-"/usr/local/shinken"}
@@ -428,3 +428,12 @@ function rheldvd(){
         fi    
     fi    
 }
+
+if [ $USEPROXY -eq 1 ]
+then
+    cecho "WARNNG : USE PROXY IS ENABLED" yellow
+    cecho "YOU MUST VERIFY THAT http_proxy and https_proxy IS ENABLED" yellow
+    cecho "YOU MUST VERIFY THAT YOUR PACKAGE MANAGER IS CONFIGURED TO USE PROXY" yellow
+    cecho "HIT ENTER TO CONTINUE OR CTRL+C TO ABORT" yellow
+    read
+fi
diff --git a/contrib/alternative-installation/shinken-install/shinken.sh b/contrib/alternative-installation/shinken-install/shinken.sh
index 0a0f96b..0f63858 100755
--- a/contrib/alternative-installation/shinken-install/shinken.sh
+++ b/contrib/alternative-installation/shinken-install/shinken.sh
@@ -1818,10 +1818,8 @@ then
         exit 1
 fi
 
-if [ ! -z "$PROXY" ]
+if [ $USEPROXY -eq 1 ]
 then
-    export http_proxy=$PROXY
-    export https_proxy=$PROXY
     export WGETPROXY=" -Y on "
 fi
 

-- 
UNNAMED PROJECT