tabs fix, upgrade_dist module doc, server to test change

This commit is contained in:
levasseur
2021-07-05 16:24:58 +02:00
parent 401f11b6b7
commit 09c94af407
4 changed files with 29 additions and 20 deletions

2
.gitignore vendored
View File

@@ -1,2 +1,2 @@
log log
.README.md.kate-swp

View File

@@ -1,2 +1,4 @@
This is ubuntu deployment scripts for LEGOS git repository This is ubuntu deployment scripts for LEGOS git repository
created on 2021-05-31-11:31:04 created on 2021-05-31-11:31:04
Check README.md for details.

View File

@@ -35,8 +35,8 @@ install_pkg()
# Install all the configured packages # Install all the configured packages
[[ -n $PKGSEL ]] && [[ -n $PKGSEL ]] &&
prnt I "Installation de la sélection de paquets..." && prnt I "Installation de la sélection de paquets..." &&
pkginst $PKGSEL pkginst $PKGSEL
} }
precheck_install_pkg() precheck_install_pkg()
@@ -49,9 +49,9 @@ precheck_install_pkg()
[[ -z PKGS_BLACKLIST ]] && [[ -z PKGS_BLACKLIST ]] &&
prnt W "Les paquets $pkg seront placés en liste noire !" prnt W "Les paquets $pkg seront placés en liste noire !"
if [[ -z $PKGSEL ]]; then if [[ -z $PKGSEL ]]; then
prnt W "Pas de paquet additionel à installer !" prnt W "Pas de paquet additionel à installer !"
else else
prnt I "$(echo $PKGSEL | wc -w) paquets additionels seront installés." prnt I "$(echo $PKGSEL | wc -w) paquets additionels seront installés."
fi fi
} }

View File

@@ -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() upgrade_dist()
{ {
@@ -8,17 +15,17 @@ upgrade_dist()
prnt I "Configuration du proxy pour APT..." prnt I "Configuration du proxy pour APT..."
if [[ $PROXYAPT ]]; then if [[ $PROXYAPT ]]; then
if [[ ! -d $(basedir $proxyfile) ]]; then if [[ ! -d $(basedir $proxyfile) ]]; then
mkdir -pv /etc/apt/apt.conf.d || ( mkdir -pv /etc/apt/apt.conf.d || (
prnt E "Impossiblle de créer le répertoire d'accueil pour la configuration d'APT." prnt E "Impossiblle de créer le répertoire d'accueil pour la configuration d'APT."
exit 10 exit 10
) )
fi fi
backupdist $proxyfile backupdist $proxyfile
echo "# Generated automatically on $(stdtime) by $0" > $proxyfile echo "# Generated automatically on $(stdtime) by $0" > $proxyfile
echo "Acquire::http::Proxy \"http://${PROXYAPT}:${PROXYAPTPORT}\";" >> $proxyfile echo "Acquire::http::Proxy \"http://${PROXYAPT}:${PROXYAPTPORT}\";" >> $proxyfile
else else
prnt I "Pas de proxy configuré, ne fait rien." prnt I "Pas de proxy configuré, ne fait rien."
fi fi
prnt I "Mise à jour de la liste des paquets..." prnt I "Mise à jour de la liste des paquets..."
@@ -32,10 +39,10 @@ upgrade_dist()
precheck_upgrade_dist() precheck_upgrade_dist()
{ {
prnt I "Vérification du réseau..." 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 if [[ ! $? -eq 0 ]]; then
prnt E "Réseau non fonctionnel ! Abandon." prnt E "Réseau non fonctionnel ! Abandon."
die 5 die 5
fi fi
if [[ -n $PROXYAPT && -z $PROXYAPTPORT ]]; then if [[ -n $PROXYAPT && -z $PROXYAPTPORT ]]; then
prnt E "Un serveur proxy a été spécifié mais pas son port d'usage." prnt E "Un serveur proxy a été spécifié mais pas son port d'usage."