Subversion Repositories ALCASAR

Compare Revisions

Ignore whitespace Rev 2455 → Rev 2457

/CHANGELOG
19,6 → 19,7
CHANGES
- Set watchdog interval to 10 minutes.
- Set URL of BL/WL blocked page ressources to ALCASAR hostname instead of blocked domain to prevent cache issues & useless overload.
- LDAP configuration is now saved in ALCASAR conf file
 
BUGS
- Fix the open of status.php when the user has a redirection URL attribute defined (force redirection to intercept.php after login instead of WISPr-Redirection-URL attribute value).
/alcasar.sh
504,7 → 504,19
PRIVATE_LAST_IP=`echo $PRIVATE_BROADCAST | cut -d"." -f1-3`"."`expr $private_broadcast_ending - 1` # last network address (ex.: 192.168.182.254)
PRIVATE_MAC=`/usr/sbin/ip link show $INTIF | grep ether | cut -d" " -f6| sed 's/:/-/g'| awk '{print toupper($0)}'` # MAC address of INTIF
# Define Internet parameters
DNS1=`grep ^nameserver /etc/resolv.conf|awk -F" " '{print $2}'|head -n 1` # 1st DNS server
DNS1=`grep ^nameserver /etc/resolv.conf|awk -F" " '{print $2}'|head -n 1` # 1st DNS server
if [ "$DNS1" != "" ] && [ "$DNS1" != "127.0.0.1" ]
then
if [ $Lang == "fr" ]
then
echo "L'adresse IP des serveurs DNS ne sont pas corrects"
echo "Vérifiez la configuration de la carte réseau externe ($EXTIF)"
else
echo "The IP address of DNS servers are not set correctly"
echo "Check the extern network card configuration ($EXTIF)"
fi
exit 0
fi
nb_dns=`grep -c ^nameserver /etc/resolv.conf`
if [ $nb_dns == 2 ]
then
/scripts/alcasar-uninstall.sh
77,7 → 77,7
done
if [ $mode == "update" ] # reload sshd in case of remote update
then
systemctl reload sshd
/usr/bin/systemctl reload sshd
fi
echo "Reset ALCASAR main functions : "
echo -en "\n- init (1) : "
280,7 → 280,7
[ -e /etc/modprobe.preload.default ] && mv -f /etc/modprobe.preload.default /etc/modprobe.preload && echo -n "7, "
[ -e /lib/systemd/system/iptables.service.default ] && mv -f /lib/systemd/system/iptables.service.default /lib/systemd/system/iptables.service && echo -n "8, "
[ -e /usr/libexec/iptables.init.default ] && mv -f /usr/libexec/iptables.init.default /usr/libexec/iptables.init && echo -n "9"
/sbin/ifup $EXTIF
/usr/bin/systemctl restart network
sleep 1
fi
 
293,7 → 293,6
[ -e /etc/sudoers.default ] && mv -f /etc/sudoers.default /etc/sudoers && echo -n "5, "
[ -e /lib/systemd/system/alcasar-load_balancing.service ] && rm -f /lib/systemd/system/alcasar-load_balancing.service && echo -n "6, "
[ -e /etc/default/grub.default ] && mv -f /etc/default/grub.default /etc/default/grub && echo -n "7"
/usr/bin/update-grub2
sleep 1
 
# Cleaning (remove all "old" alcasar scripts)
302,3 → 301,16
do
rm -rf $rm_fic/alcasar*
done
/usr/bin/update-grub2
echo "Waiting for Network to be up again ..."
i=0
while [ $i -lt 10 ] # We wait 10 seconds max
do
DNS1=`grep ^nameserver /etc/resolv.conf|awk -F" " '{print $2}'|head -n 1`
if [ "$DNS1" != "" ] && [ "$DNS1" != "127.0.0.1" ]
then
i=9
fi
i=`expr $i + 1`
sleep 1
done