removed trailing and unneeded space and tabs
This commit is contained in:
@@ -17,7 +17,7 @@ function die()
|
|||||||
|
|
||||||
# Don't trigger the ERR signal as we already managed the error
|
# Don't trigger the ERR signal as we already managed the error
|
||||||
trap - ERR
|
trap - ERR
|
||||||
|
|
||||||
if [[ "$KEEPGOING" != "true" ]] || [[ "$2" == "--force" ]]; then
|
if [[ "$KEEPGOING" != "true" ]] || [[ "$2" == "--force" ]]; then
|
||||||
prnt E "Sortie prématuré avec erreur (code #$errorcode)."
|
prnt E "Sortie prématuré avec erreur (code #$errorcode)."
|
||||||
# We remove KEEPGOING in case of --force so error() behave correctly
|
# We remove KEEPGOING in case of --force so error() behave correctly
|
||||||
@@ -27,7 +27,7 @@ function die()
|
|||||||
prnt W "On continue malgrés l'erreur #$errorcode."
|
prnt W "On continue malgrés l'erreur #$errorcode."
|
||||||
fi
|
fi
|
||||||
unset errorcode
|
unset errorcode
|
||||||
|
|
||||||
# Put the trigger back (only executed with --keepgoing)
|
# Put the trigger back (only executed with --keepgoing)
|
||||||
trap "error ${LINENO}" ERR
|
trap "error ${LINENO}" ERR
|
||||||
}
|
}
|
||||||
@@ -52,10 +52,10 @@ function error()
|
|||||||
local parent_lineno="$1"
|
local parent_lineno="$1"
|
||||||
local message="$2"
|
local message="$2"
|
||||||
local code="${3:-1}"
|
local code="${3:-1}"
|
||||||
|
|
||||||
# Print error header
|
# Print error header
|
||||||
prnt E "${BIWhite}*** ${BIRed}Une erreur fatale est intervenue, le script va s'arrêter immédiatement !$DEFAULTCOL"
|
prnt E "${BIWhite}*** ${BIRed}Une erreur fatale est intervenue, le script va s'arrêter immédiatement !$DEFAULTCOL"
|
||||||
|
|
||||||
if [[ -n "$message" ]]; then
|
if [[ -n "$message" ]]; then
|
||||||
prnt E "Erreur ligne $parent_lineno, code d'erreur $code avec le message :"
|
prnt E "Erreur ligne $parent_lineno, code d'erreur $code avec le message :"
|
||||||
echo -e "\t\t$message"
|
echo -e "\t\t$message"
|
||||||
@@ -87,7 +87,7 @@ function backtrace
|
|||||||
{
|
{
|
||||||
echo "======== Pile d'appel ========"
|
echo "======== Pile d'appel ========"
|
||||||
typeset -i i=0
|
typeset -i i=0
|
||||||
|
|
||||||
local func=
|
local func=
|
||||||
for func in "${FUNCNAME[@]}"; do
|
for func in "${FUNCNAME[@]}"; do
|
||||||
if [[ $i -ne 0 ]]; then
|
if [[ $i -ne 0 ]]; then
|
||||||
|
|||||||
@@ -76,7 +76,7 @@ show_version()
|
|||||||
echo -e "${BWhite}init.sh${DEFAULTCOL} version ${BGreen}$VERSION${DEFAULTCOL}"
|
echo -e "${BWhite}init.sh${DEFAULTCOL} version ${BGreen}$VERSION${DEFAULTCOL}"
|
||||||
echo ""
|
echo ""
|
||||||
echo "Modules disponibles :"
|
echo "Modules disponibles :"
|
||||||
|
|
||||||
local mod=
|
local mod=
|
||||||
for mod in $MYPATH/modules/*.sh; do
|
for mod in $MYPATH/modules/*.sh; do
|
||||||
# Ran in a subshell to not pollute environment
|
# Ran in a subshell to not pollute environment
|
||||||
@@ -91,7 +91,7 @@ show_version()
|
|||||||
)
|
)
|
||||||
done
|
done
|
||||||
unset mod
|
unset mod
|
||||||
|
|
||||||
if [[ $(id -u) -ne 0 ]]; then
|
if [[ $(id -u) -ne 0 ]]; then
|
||||||
echo -e "\n${BYellow}Attention :$DEFAULTCOL Ce script requiert les droits d'administration pour fonctionner."
|
echo -e "\n${BYellow}Attention :$DEFAULTCOL Ce script requiert les droits d'administration pour fonctionner."
|
||||||
fi
|
fi
|
||||||
|
|||||||
@@ -53,7 +53,7 @@ set_sys_vars()
|
|||||||
prnt E "get_os_version(): incorect number of parameters ($@)."
|
prnt E "get_os_version(): incorect number of parameters ($@)."
|
||||||
die --force 7
|
die --force 7
|
||||||
fi
|
fi
|
||||||
|
|
||||||
export SYS_ARCH=$1
|
export SYS_ARCH=$1
|
||||||
export SYS_DIST=$2
|
export SYS_DIST=$2
|
||||||
export SYS_VER=$3
|
export SYS_VER=$3
|
||||||
|
|||||||
@@ -19,12 +19,12 @@ read_commandline()
|
|||||||
prnt E "Erreur d'analyse de la ligne de commande, vérifiez vos paramètres."
|
prnt E "Erreur d'analyse de la ligne de commande, vérifiez vos paramètres."
|
||||||
die 1 --force
|
die 1 --force
|
||||||
}
|
}
|
||||||
|
|
||||||
# Processing command line options
|
# Processing command line options
|
||||||
local want_module=false
|
local want_module=false
|
||||||
local want_logfile=false
|
local want_logfile=false
|
||||||
local want_conffile=false
|
local want_conffile=false
|
||||||
|
|
||||||
local opt=
|
local opt=
|
||||||
for opt in $@; do
|
for opt in $@; do
|
||||||
case $opt in
|
case $opt in
|
||||||
|
|||||||
@@ -24,7 +24,7 @@ export DEP_conf_disks="upgrade_dist"
|
|||||||
conf_zfs()
|
conf_zfs()
|
||||||
{
|
{
|
||||||
prnt I "Création du volume calcul en ZFS."
|
prnt I "Création du volume calcul en ZFS."
|
||||||
|
|
||||||
# Create destination directory
|
# Create destination directory
|
||||||
mkdir -pv $CALCMOUNTPOINT
|
mkdir -pv $CALCMOUNTPOINT
|
||||||
|
|
||||||
@@ -53,7 +53,7 @@ conf_zfs()
|
|||||||
partprobe
|
partprobe
|
||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ $(zpool create zcalc -m $CALCMOUNTPOINT $CALCLEVEL $opt $CALCDRV) ]]; then
|
if [[ $(zpool create zcalc -m $CALCMOUNTPOINT $CALCLEVEL $opt $CALCDRV) ]]; then
|
||||||
# We activate lz4 compression by default
|
# We activate lz4 compression by default
|
||||||
zpool set zcalc compression=lz4
|
zpool set zcalc compression=lz4
|
||||||
@@ -98,7 +98,7 @@ conf_xfs()
|
|||||||
conf_disks()
|
conf_disks()
|
||||||
{
|
{
|
||||||
[[ -n $STOP_CONF_DISK ]] && return 0
|
[[ -n $STOP_CONF_DISK ]] && return 0
|
||||||
|
|
||||||
if [[ ! $CALCDRV ]]; then
|
if [[ ! $CALCDRV ]]; then
|
||||||
prnt I "Pas de disque de calcul défini, rien à faire."
|
prnt I "Pas de disque de calcul défini, rien à faire."
|
||||||
return 0
|
return 0
|
||||||
@@ -140,9 +140,9 @@ precheck_conf_disks()
|
|||||||
prnt E "Le disque $drv n'existe pas. Abandon."
|
prnt E "Le disque $drv n'existe pas. Abandon."
|
||||||
die 150
|
die 150
|
||||||
fi
|
fi
|
||||||
(( drvcount+=1 ))
|
(( drvcount+=1 ))
|
||||||
done
|
done
|
||||||
|
|
||||||
if [[ ! $CALCTYPE=="zfs" && drvcount -gt 1 ]]; then
|
if [[ ! $CALCTYPE=="zfs" && drvcount -gt 1 ]]; then
|
||||||
prnt E "Plusieurs diques impossibles avec Ext4 ou XFS !"
|
prnt E "Plusieurs diques impossibles avec Ext4 ou XFS !"
|
||||||
die 150
|
die 150
|
||||||
|
|||||||
@@ -19,7 +19,7 @@ conf_mail()
|
|||||||
{
|
{
|
||||||
prnt I "Installation de postfix..."
|
prnt I "Installation de postfix..."
|
||||||
pkginst postfix
|
pkginst postfix
|
||||||
|
|
||||||
prnt I "Configuration de postfix..."
|
prnt I "Configuration de postfix..."
|
||||||
installfile postfix_main.cf /etc/postfix/main.cf
|
installfile postfix_main.cf /etc/postfix/main.cf
|
||||||
sed -i -e "s/@HOSTNAME@/$HOSTNAME/" -e "s/@MAINDOM@/$MAINDOM/" \
|
sed -i -e "s/@HOSTNAME@/$HOSTNAME/" -e "s/@MAINDOM@/$MAINDOM/" \
|
||||||
|
|||||||
@@ -21,7 +21,7 @@ conf_ssh()
|
|||||||
|
|
||||||
prnt I "Arrêt du service SSH..."
|
prnt I "Arrêt du service SSH..."
|
||||||
svc_stop ssh
|
svc_stop ssh
|
||||||
|
|
||||||
prnt I "Installation des fichiers de configuration de SSH..."
|
prnt I "Installation des fichiers de configuration de SSH..."
|
||||||
for f in /etc/ssh/ssh{,d}_config; do
|
for f in /etc/ssh/ssh{,d}_config; do
|
||||||
backupdist $f
|
backupdist $f
|
||||||
|
|||||||
@@ -20,7 +20,7 @@ create_vm()
|
|||||||
prnt I "Cette machine n'est pas configurée pour la virtualisation, rien à faire."
|
prnt I "Cette machine n'est pas configurée pour la virtualisation, rien à faire."
|
||||||
return 0
|
return 0
|
||||||
fi
|
fi
|
||||||
|
|
||||||
pkginst virtualbox
|
pkginst virtualbox
|
||||||
|
|
||||||
# Create welcoming dirs
|
# Create welcoming dirs
|
||||||
|
|||||||
@@ -21,20 +21,20 @@ install_chromium()
|
|||||||
# Add Debian Buster repo to sources.list.d directory
|
# Add Debian Buster repo to sources.list.d directory
|
||||||
prnt I "Ajout du dépot Debian Buster aux sources logicielles..."
|
prnt I "Ajout du dépot Debian Buster aux sources logicielles..."
|
||||||
installfile debian_buster.list /etc/apt/sources.list.d/
|
installfile debian_buster.list /etc/apt/sources.list.d/
|
||||||
|
|
||||||
# Install Debian GPG keys
|
# Install Debian GPG keys
|
||||||
apt-key adv --keyserver keyserver.ubuntu.com --recv-keys DCC9EFBF77E11517
|
apt-key adv --keyserver keyserver.ubuntu.com --recv-keys DCC9EFBF77E11517
|
||||||
apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 648ACFD622F3D138
|
apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 648ACFD622F3D138
|
||||||
apt-key adv --keyserver keyserver.ubuntu.com --recv-keys AA8E81B4331F7F50
|
apt-key adv --keyserver keyserver.ubuntu.com --recv-keys AA8E81B4331F7F50
|
||||||
apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 112695A0E562B32A
|
apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 112695A0E562B32A
|
||||||
|
|
||||||
# Install package manager conf file for Chromium
|
# Install package manager conf file for Chromium
|
||||||
installfile apt_chromium.conf /etc/apt/preferences.d/
|
installfile apt_chromium.conf /etc/apt/preferences.d/
|
||||||
|
|
||||||
# Update package list and install
|
# Update package list and install
|
||||||
prnt I "Mise à jour de la liste des dépots..."
|
prnt I "Mise à jour de la liste des dépots..."
|
||||||
pkgupt
|
pkgupt
|
||||||
|
|
||||||
prnt I "Installation de Chromium..."
|
prnt I "Installation de Chromium..."
|
||||||
pkginst chromium
|
pkginst chromium
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -14,12 +14,12 @@ export DEP_install_profile="install_pkg"
|
|||||||
install_profile()
|
install_profile()
|
||||||
{
|
{
|
||||||
#installfile ansi_shadow.flf /usr/share/figlet/ansi_shadow.flf
|
#installfile ansi_shadow.flf /usr/share/figlet/ansi_shadow.flf
|
||||||
|
|
||||||
local usrlist="/root"
|
local usrlist="/root"
|
||||||
if find /home -mindepth 1 -maxdepth 1 -type d | read; then
|
if find /home -mindepth 1 -maxdepth 1 -type d | read; then
|
||||||
usrlist="$usrlist /home/*"
|
usrlist="$usrlist /home/*"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Create a dir in home so /home/* is always interpreted correctly
|
# Create a dir in home so /home/* is always interpreted correctly
|
||||||
for usr in $usrlist; do
|
for usr in $usrlist; do
|
||||||
backupdist $usr/{,.}profile $usr/.bashrc
|
backupdist $usr/{,.}profile $usr/.bashrc
|
||||||
|
|||||||
@@ -22,7 +22,7 @@ export DEP_upgrade_dist="conf_ntp"
|
|||||||
upgrade_dist()
|
upgrade_dist()
|
||||||
{
|
{
|
||||||
local proxyfile=/etc/apt/apt.conf.d/00proxy
|
local proxyfile=/etc/apt/apt.conf.d/00proxy
|
||||||
|
|
||||||
# We backup entire apt dir as future version will normalise source.list files
|
# We backup entire apt dir as future version will normalise source.list files
|
||||||
backupdist /etc/apt
|
backupdist /etc/apt
|
||||||
|
|
||||||
@@ -42,16 +42,16 @@ upgrade_dist()
|
|||||||
else
|
else
|
||||||
prnt I "Pas de proxy configuré, ne fait rien."
|
prnt I "Pas de proxy configuré, ne fait rien."
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Remplace source.list from dist with ours (be smarter)
|
# Remplace source.list from dist with ours (be smarter)
|
||||||
installfile "${SYS_DIST}_${SYS_VER}.list" /etc/apt/sources.list
|
installfile "${SYS_DIST}_${SYS_VER}.list" /etc/apt/sources.list
|
||||||
|
|
||||||
prnt I "Mise à jour de la liste des paquets..."
|
prnt I "Mise à jour de la liste des paquets..."
|
||||||
pkgupdt
|
pkgupdt
|
||||||
|
|
||||||
prnt I "Application des mises à jour de paquets..."
|
prnt I "Application des mises à jour de paquets..."
|
||||||
pkgupgd
|
pkgupgd
|
||||||
|
|
||||||
prnt I "Suppression des paquets résiduels..."
|
prnt I "Suppression des paquets résiduels..."
|
||||||
pkgautorem
|
pkgautorem
|
||||||
}
|
}
|
||||||
@@ -59,7 +59,7 @@ upgrade_dist()
|
|||||||
precheck_upgrade_dist()
|
precheck_upgrade_dist()
|
||||||
{
|
{
|
||||||
prnt I "Vérification du réseau..."
|
prnt I "Vérification du réseau..."
|
||||||
|
|
||||||
if [[ $(noerror wget -q --tries=10 --timeout=20 --spider http://www.cnrs.fr) != 0 ]]; then
|
if [[ $(noerror wget -q --tries=10 --timeout=20 --spider http://www.cnrs.fr) != 0 ]]; then
|
||||||
prnt E "Réseau non fonctionnel ! Abandon."
|
prnt E "Réseau non fonctionnel ! Abandon."
|
||||||
die 160
|
die 160
|
||||||
|
|||||||
Reference in New Issue
Block a user