Subversion Repositories ALCASAR

Compare Revisions

Ignore whitespace Rev 1248 → Rev 1249

/alcasar.sh
600,8 → 600,8
/usr/sbin/htdigest -c $DIR_DEST_ETC/digest/key_admin $HOSTNAME.$DOMAIN $admin_portal
done
$DIR_DEST_SBIN/alcasar-profil.sh --list
else # mise à jour des versions < 2.1
if [ $MAJ_PREVIOUS_VERSION -lt 2 ] || ([ $MAJ_PREVIOUS_VERSION -eq 2 ] && [ $MIN_PREVIOUS_VERSION -lt 1 ])
else # mise à jour des versions < 2.8
if [ $MAJ_PREVIOUS_VERSION -lt 2 ] || ([ $MAJ_PREVIOUS_VERSION -eq 2 ] && [ $MIN_PREVIOUS_VERSION -lt 8 ])
then
if [ $Lang == "fr" ]
then
977,7 → 977,7
#nodynip
#statip
dynip $PRIVATE_NETWORK_MASK
domain localdomain
domain $DOMAIN
dns1 $PRIVATE_IP
dns2 $PRIVATE_IP
uamlisten $PRIVATE_IP
993,7 → 993,7
uamserver https://$HOSTNAME.$DOMAIN/intercept.php
radiusnasid $HOSTNAME.$DOMAIN
uamsecret $secretuam
uamallowed alcasar
uamallowed $HOSTNAME,$HOSTNAME.$DOMAIN
coaport 3799
include $DIR_DEST_ETC/alcasar-uamallowed
include $DIR_DEST_ETC/alcasar-uamdomain
1744,13 → 1744,13
license
header_install
testing
# Test if ALCASAR is already installed
if [ -e $DIR_WEB/VERSION ]
# Test if ALCASAR is already installed (before v2.2, the conf file doesn't exist --> can't update)
if [ -e $CONF_FILE ]
then
actual_version=`cat $DIR_WEB/VERSION`
current_version=`cat $CONF_FILE | grep VERSION | cut -d"=" -f2`
if [ $Lang == "fr" ]
then echo -n "La version "; echo -n $actual_version ; echo " d'ALCASAR est déjà installée";
else echo -n "ALCASAR Version "; echo -n $actual_version ; echo " is already installed";
then echo -n "La version "; echo -n $current_version ; echo " d'ALCASAR est déjà installée";
else echo -n "ALCASAR Version "; echo -n $current_version ; echo " is already installed";
fi
response=0
PTN='^[oOnNyY]$'
1773,12 → 1773,11
fi
# RPMs install
$DIR_SCRIPTS/alcasar-urpmi.sh
echo "Mise à jour des modules noyau installés"
if [ "$?" != "0" ]
then
exit 0
fi
if [ -e $DIR_WEB/VERSION ]
if [ -e $CONF_FILE ]
then
# Uninstall the running version
$DIR_SCRIPTS/sbin/alcasar-uninstall.sh