Subversion Repositories ALCASAR

Compare Revisions

Ignore whitespace Rev 1566 → Rev 1567

/alcasar.sh
1393,6 → 1393,8
 
##########################################################
## Function "nfsen" ##
## - install the nfsen grapher ##
## - install the two plugins porttracker & surfmap ##
##########################################################
nfsen()
{
1941,30 → 1943,6
$DIR_DEST_BIN/alcasar-conf.sh --apply
$SED "s?^INSTALL_DATE=.*?INSTALL_DATE=$DATE?g" $CONF_FILE
$SED "s?^VERSION=.*?VERSION=$VERSION?g" $CONF_FILE
if [ $MAJ_PREVIOUS_VERSION -lt 2 ] || ([ $MAJ_PREVIOUS_VERSION -eq 2 ] && [ $MIN_PREVIOUS_VERSION -lt 8 ])
# update needed for versions previous then 2.8 due to the integration of the domainname ("localdomain" by default)
then
header_install
if [ $Lang == "fr" ]
then
echo "Cette mise à jour nécessite de redéfinir le premier compte d'administration du portail"
echo
echo -n "Nom : "
else
echo "This update need to redefine the first admin account"
echo
echo -n "Account : "
fi
read admin_portal
[ -d $DIR_DEST_ETC/digest ] && rm -rf $DIR_DEST_ETC/digest
mkdir -p $DIR_DEST_ETC/digest
chmod 755 $DIR_DEST_ETC/digest
until [ -s $DIR_DEST_ETC/digest/key_admin ]
do
/usr/bin/htdigest -c $DIR_DEST_ETC/digest/key_admin $HOSTNAME.$DOMAIN $admin_portal
done
$DIR_DEST_SBIN/alcasar-profil.sh --list
fi
fi
rm -f /tmp/alcasar-conf*
chown -R root:apache $DIR_DEST_ETC/*
/scripts/alcasar-conf.sh
148,9 → 148,9
ssh_active=`grep SSH= $CONF_FILE|cut -d"=" -f2`
if [ $ssh_active = "on" ]
then
/sbin/chkconfig --add sshd
systemctl -q enable sshd.service
else
/sbin/chkconfig --del sshd
systemctl -q disable sshd.service
fi
# Remove the update folder
rm -rf $DIR_UPDATE
/scripts/sbin/alcasar-uninstall.sh
143,9 → 143,8
sleep 1
 
#nfsen
echo -en "\n- nfsen(2) : "
[ -e /lib/systemd/system/nfsen.service ] && rm -f /lib/systemd/system/nfsen.service && echo -n "1, "
[ -e /var/www/nfsen/plugins/SURFmap.php ] && rm -rf /var/www/nfsen/plugins/SURFmap* && echo -n "2"
echo -en "\n- nfsen(1) : "
[ -e /lib/systemd/system/nfsen.service ] && rm -f /lib/systemd/system/nfsen.service && echo -n "1"
sleep 1
 
#vnstat