tabs fix, upgrade_dist module doc, server to test change
This commit is contained in:
@@ -1,6 +1,13 @@
|
||||
# Distribution upgrade module, should be ran prior any other module
|
||||
# ------------------------------------------------------------------------------
|
||||
# Distribution upgrade module, should be ran prior any other module (also
|
||||
# configure APT)
|
||||
# ------------------------------------------------------------------------------
|
||||
# Variable:
|
||||
# * PROXYAPT: Proxy to use with APT (eg. APT Cacher)
|
||||
# * PROXYAPTPORT: Working port for APT proxy
|
||||
# ------------------------------------------------------------------------------
|
||||
|
||||
export VER_upgrade_dist="0.0.5"
|
||||
export VER_upgrade_dist="0.0.6"
|
||||
|
||||
upgrade_dist()
|
||||
{
|
||||
@@ -8,17 +15,17 @@ upgrade_dist()
|
||||
|
||||
prnt I "Configuration du proxy pour APT..."
|
||||
if [[ $PROXYAPT ]]; then
|
||||
if [[ ! -d $(basedir $proxyfile) ]]; then
|
||||
mkdir -pv /etc/apt/apt.conf.d || (
|
||||
prnt E "Impossiblle de créer le répertoire d'accueil pour la configuration d'APT."
|
||||
exit 10
|
||||
)
|
||||
fi
|
||||
backupdist $proxyfile
|
||||
echo "# Generated automatically on $(stdtime) by $0" > $proxyfile
|
||||
echo "Acquire::http::Proxy \"http://${PROXYAPT}:${PROXYAPTPORT}\";" >> $proxyfile
|
||||
if [[ ! -d $(basedir $proxyfile) ]]; then
|
||||
mkdir -pv /etc/apt/apt.conf.d || (
|
||||
prnt E "Impossiblle de créer le répertoire d'accueil pour la configuration d'APT."
|
||||
exit 10
|
||||
)
|
||||
fi
|
||||
backupdist $proxyfile
|
||||
echo "# Generated automatically on $(stdtime) by $0" > $proxyfile
|
||||
echo "Acquire::http::Proxy \"http://${PROXYAPT}:${PROXYAPTPORT}\";" >> $proxyfile
|
||||
else
|
||||
prnt I "Pas de proxy configuré, ne fait rien."
|
||||
prnt I "Pas de proxy configuré, ne fait rien."
|
||||
fi
|
||||
|
||||
prnt I "Mise à jour de la liste des paquets..."
|
||||
@@ -32,10 +39,10 @@ upgrade_dist()
|
||||
precheck_upgrade_dist()
|
||||
{
|
||||
prnt I "Vérification du réseau..."
|
||||
wget -q --tries=10 --timeout=20 --spider http://google.com
|
||||
wget -q --tries=10 --timeout=20 --spider http://www.cnrs.fr
|
||||
if [[ ! $? -eq 0 ]]; then
|
||||
prnt E "Réseau non fonctionnel ! Abandon."
|
||||
die 5
|
||||
prnt E "Réseau non fonctionnel ! Abandon."
|
||||
die 5
|
||||
fi
|
||||
if [[ -n $PROXYAPT && -z $PROXYAPTPORT ]]; then
|
||||
prnt E "Un serveur proxy a été spécifié mais pas son port d'usage."
|
||||
|
||||
Reference in New Issue
Block a user